Skip to content

Commit e095e55

Browse files
committed
tests: Pass --output-directory to vm() and boot()
The integration tests build into a per-test `--output-directory`, but the verbs that consume the build (vm, boot) did not pass it, so they recovered the build's configuration from the history in the config directory. This breaks parallel tests, as they read the history file from current global file (i.e. whichever build happened to finish last). This is the tests/__init__.py half of the reverted commit da49fe9. (That wasn't problematic.)
1 parent 542923e commit e095e55

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

tests/__init__.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,13 @@ def boot(self, options: Sequence[str] = (), args: Sequence[str] = ()) -> Complet
126126
"--register=no",
127127
"--machine",
128128
self.machine,
129+
"--output-directory", self.output_dir,
129130
*options,
130131
],
131132
args,
132133
stdin=sys.stdin if sys.stdin.isatty() else None,
133134
check=False,
134-
)
135+
) # fmt: skip
135136

136137
if result.returncode != 123:
137138
raise subprocess.CalledProcessError(result.returncode, result.args, result.stdout, result.stderr)
@@ -158,12 +159,13 @@ def vm(
158159
"--register=no",
159160
"--machine",
160161
self.machine,
162+
"--output-directory", self.output_dir,
161163
*options,
162164
],
163165
args,
164166
stdin=sys.stdin if sys.stdin.isatty() else None,
165167
check=False,
166-
)
168+
) # fmt: skip
167169

168170
if result.returncode != 123:
169171
raise subprocess.CalledProcessError(result.returncode, result.args, result.stdout, result.stderr)

0 commit comments

Comments
 (0)