ci: set VTMP too in set_test_env/1, to avoid cloning conflicts during parallel test executions

spytheman · spytheman · commit 770a2db50333 · 2025-12-07T23:59:41.000+02:00
diff --git a/cmd/tools/vpm/dependency_test.v b/cmd/tools/vpm/dependency_test.v
@@ -12,13 +12,14 @@ fn testsuite_begin() {
 		eprintln('> skipping ${@FILE}, when `-d network` is missing')
 		exit(0)
 	}
-	unbuffer_stdout()
-	os.setenv('VMODULES', test_path, true)
-	os.setenv('VPM_DEBUG', '', true)
-	os.setenv('VPM_NO_INCREMENT', '1', true)
+	dump(test_path)
+	test_utils.set_test_env(test_path)
+	os.mkdir_all(test_path) or {}
+	os.chdir(test_path)!
 }
 
 fn testsuite_end() {
+	dump(os.system('find ${test_path}'))
 	os.rmdir_all(test_path) or {}
 }
 
@@ -32,7 +33,6 @@ fn get_mod_name(path string) string {
 
 // Case: running `v install` without specifying modules in a V project directory.
 fn test_install_dependencies_in_module_dir() {
-	os.mkdir_all(test_path) or {}
 	mod := 'my_module'
 	mod_path := os.join_path(test_path, mod)
 	os.mkdir(mod_path)!
diff --git a/cmd/tools/vpm/install_test.v b/cmd/tools/vpm/install_test.v
@@ -16,7 +16,7 @@ fn testsuite_begin() {
 		eprintln('> skipping ${@FILE}, when `-d network` is missing')
 		exit(0)
 	}
-	unbuffer_stdout()
+	dump(test_path)
 	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
@@ -18,8 +18,8 @@ fn testsuite_begin() {
 		eprintln('> skipping ${@FILE}, when `-d network` is missing')
 		exit(0)
 	}
+	dump(test_path)
 	test_utils.set_test_env(test_path)
-	eprintln('>> test_path: ${test_path}')
 	// Explicitly disable fail on prompt.
 	os.setenv('VPM_FAIL_ON_PROMPT', '', true)
 	os.mkdir_all(test_path) or {}
diff --git a/cmd/tools/vpm/install_version_test.v b/cmd/tools/vpm/install_version_test.v
@@ -14,6 +14,7 @@ fn testsuite_begin() {
 		eprintln('> skipping ${@FILE}, when `-d network` is missing')
 		exit(0)
 	}
+	dump(test_path)
 	test_utils.set_test_env(test_path)
 }
 
diff --git a/cmd/tools/vpm/outdated_test.v b/cmd/tools/vpm/outdated_test.v
@@ -12,11 +12,10 @@ fn testsuite_begin() {
 		eprintln('> skipping ${@FILE}, when `-d network` is missing')
 		exit(0)
 	}
-	unbuffer_stdout()
+	dump(test_path)
 	test_utils.set_test_env(test_path)
 	os.mkdir_all(test_path)!
 	os.chdir(test_path)!
-	println('test_path: ${test_path}')
 }
 
 fn testsuite_end() {
diff --git a/cmd/tools/vpm/remove_test.v b/cmd/tools/vpm/remove_test.v
@@ -11,6 +11,7 @@ fn testsuite_begin() {
 		eprintln('> skipping ${@FILE}, when `-d network` is missing')
 		exit(0)
 	}
+	dump(test_path)
 	test_utils.set_test_env(test_path)
 }
 
diff --git a/cmd/tools/vpm/test_utils/utils.v b/cmd/tools/vpm/test_utils/utils.v
@@ -5,11 +5,17 @@ import net
 import time
 
 pub fn set_test_env(test_path string) {
+	unbuffer_stdout()
 	os.setenv('VMODULES', test_path, true)
 	os.setenv('VPM_DEBUG', '', true)
 	os.setenv('VPM_NO_INCREMENT', '1', true)
 	os.setenv('VPM_FAIL_ON_PROMPT', '1', true)
-	unbuffer_stdout()
+	// Note: setting a local VTMP here, is *very important*, because VTMP is used for
+	// the destination of the temporary clones done by the child `v install` processes.
+	// If it is not done, then there is a small chance, that multiple parallel tests
+	// can do clones to the same exact folders at the same time, which can make them
+	// fail on the CI, with hard to diagnose spurious errors.
+	os.setenv('VTMP', os.join_path(test_path, 'vtmp'), true)
 }
 
 pub fn hg_serve(hg_path string, path string, start_port int) (&os.Process, int) {
diff --git a/cmd/tools/vpm/update_test.v b/cmd/tools/vpm/update_test.v
@@ -12,7 +12,7 @@ fn testsuite_begin() {
 		eprintln('> skipping ${@FILE}, when `-d network` is missing')
 		exit(0)
 	}
-	unbuffer_stdout()
+	dump(test_path)
 	test_utils.set_test_env(test_path)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ fn testsuite_begin() {`
`16`	`16`	eprintln('> skipping ${@FILE}, when `-d network` is missing')
`17`	`17`	`exit(0)`
`18`	`18`	`}`
`19`		`- unbuffer_stdout()`
	`19`	`+ dump(test_path)`
`20`	`20`	`test_utils.set_test_env(test_path)`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ fn testsuite_begin() {`
`14`	`14`	eprintln('> skipping ${@FILE}, when `-d network` is missing')
`15`	`15`	`exit(0)`
`16`	`16`	`}`
	`17`	`+ dump(test_path)`
`17`	`18`	`test_utils.set_test_env(test_path)`
`18`	`19`	`}`
`19`	`20`
Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,10 @@ fn testsuite_begin() {`
`12`	`12`	eprintln('> skipping ${@FILE}, when `-d network` is missing')
`13`	`13`	`exit(0)`
`14`	`14`	`}`
`15`		`- unbuffer_stdout()`
	`15`	`+ dump(test_path)`
`16`	`16`	`test_utils.set_test_env(test_path)`
`17`	`17`	`os.mkdir_all(test_path)!`
`18`	`18`	`os.chdir(test_path)!`
`19`		`- println('test_path: ${test_path}')`
`20`	`19`	`}`
`21`	`20`
`22`	`21`	`fn testsuite_end() {`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ fn testsuite_begin() {`
`11`	`11`	eprintln('> skipping ${@FILE}, when `-d network` is missing')
`12`	`12`	`exit(0)`
`13`	`13`	`}`
	`14`	`+ dump(test_path)`
`14`	`15`	`test_utils.set_test_env(test_path)`
`15`	`16`	`}`
`16`	`17`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ fn testsuite_begin() {`
`12`	`12`	eprintln('> skipping ${@FILE}, when `-d network` is missing')
`13`	`13`	`exit(0)`
`14`	`14`	`}`
`15`		`- unbuffer_stdout()`
	`15`	`+ dump(test_path)`
`16`	`16`	`test_utils.set_test_env(test_path)`
`17`	`17`	`}`
`18`	`18`