From e6bb6df5917ca982d2b7b657a19be1ccb76a586e Mon Sep 17 00:00:00 2001 From: Delyan Angelov Date: Sun, 10 Dec 2023 12:14:56 +0200 Subject: [PATCH] tools.vpm: skip slow tests, that do need network access, when `-d network` is not provided --- cmd/tools/vpm/dependency_test.v | 4 ++++ cmd/tools/vpm/install_test.v | 4 ++++ cmd/tools/vpm/install_version_input_test.v | 4 ++++ cmd/tools/vpm/install_version_test.v | 4 ++++ cmd/tools/vpm/outdated_test.v | 4 ++++ cmd/tools/vpm/update_test.v | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/cmd/tools/vpm/dependency_test.v b/cmd/tools/vpm/dependency_test.v index 9743031c33..4ba9a5c2f7 100644 --- a/cmd/tools/vpm/dependency_test.v +++ b/cmd/tools/vpm/dependency_test.v @@ -8,6 +8,10 @@ const v = os.quoted_path(@VEXE) const test_path = os.join_path(os.vtmp_dir(), 'vpm_dependency_test_${rand.ulid()}') fn testsuite_begin() { + $if !network ? { + eprintln('> skipping ${@FILE}, when `-d network` is missing') + exit(0) + } os.setenv('VMODULES', test_path, true) os.setenv('VPM_DEBUG', '', true) os.setenv('VPM_NO_INCREMENT', '1', true) diff --git a/cmd/tools/vpm/install_test.v b/cmd/tools/vpm/install_test.v index 6e8e538153..e7e3320b3f 100644 --- a/cmd/tools/vpm/install_test.v +++ b/cmd/tools/vpm/install_test.v @@ -11,6 +11,10 @@ import test_utils const test_path = os.join_path(os.vtmp_dir(), 'vpm_install_test_${rand.ulid()}') fn testsuite_begin() { + $if !network ? { + eprintln('> skipping ${@FILE}, when `-d network` is missing') + exit(0) + } test_utils.set_test_env(test_path) } diff --git a/cmd/tools/vpm/install_version_input_test.v b/cmd/tools/vpm/install_version_input_test.v index fc9e31b368..f2fc47d893 100644 --- a/cmd/tools/vpm/install_version_input_test.v +++ b/cmd/tools/vpm/install_version_input_test.v @@ -13,6 +13,10 @@ const expect_exe = os.quoted_path(os.find_abs_path_of_executable('expect') or { }) fn testsuite_begin() { + $if !network ? { + eprintln('> skipping ${@FILE}, when `-d network` is missing') + exit(0) + } test_utils.set_test_env(test_path) // Explicitly disable fail on prompt. os.setenv('VPM_FAIL_ON_PROMPT', '', true) diff --git a/cmd/tools/vpm/install_version_test.v b/cmd/tools/vpm/install_version_test.v index db36df5b63..77c9ccd132 100644 --- a/cmd/tools/vpm/install_version_test.v +++ b/cmd/tools/vpm/install_version_test.v @@ -9,6 +9,10 @@ import test_utils const test_path = os.join_path(os.vtmp_dir(), 'vpm_install_version_test_${rand.ulid()}') fn testsuite_begin() { + $if !network ? { + eprintln('> skipping ${@FILE}, when `-d network` is missing') + exit(0) + } test_utils.set_test_env(test_path) } diff --git a/cmd/tools/vpm/outdated_test.v b/cmd/tools/vpm/outdated_test.v index 98e4798e78..99691f98e4 100644 --- a/cmd/tools/vpm/outdated_test.v +++ b/cmd/tools/vpm/outdated_test.v @@ -8,6 +8,10 @@ import test_utils const test_path = os.join_path(os.vtmp_dir(), 'vpm_outdated_test_${rand.ulid()}') fn testsuite_begin() { + $if !network ? { + eprintln('> skipping ${@FILE}, when `-d network` is missing') + exit(0) + } test_utils.set_test_env(test_path) os.mkdir_all(test_path)! os.chdir(test_path)! diff --git a/cmd/tools/vpm/update_test.v b/cmd/tools/vpm/update_test.v index b4c7bb5e4b..528c83deba 100644 --- a/cmd/tools/vpm/update_test.v +++ b/cmd/tools/vpm/update_test.v @@ -7,6 +7,10 @@ const v = os.quoted_path(@VEXE) const test_path = os.join_path(os.vtmp_dir(), 'vpm_update_test_${rand.ulid()}') fn testsuite_begin() { + $if !network ? { + eprintln('> skipping ${@FILE}, when `-d network` is missing') + exit(0) + } test_utils.set_test_env(test_path) }