diff --git a/Jenkinsfile b/Jenkinsfile index c5ecc0ec..31b66517 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,8 +36,7 @@ pipeline { dir("${REPO}/tests"){ viewEnv(){ withVenv{ - // runPytest('--numprocesses=4') - runPytest('-k "midi" -s') + runPytest('--numprocesses=4') } } } @@ -76,8 +75,6 @@ pipeline { } post { cleanup { - // Temp debug used by test_tx - archiveArtifacts artifacts: "${REPO}/**/*.txt", fingerprint: true, allowEmptyArchive: true xcoreCleanSandbox() } } diff --git a/tests/conftest.py b/tests/conftest.py index ba8b0a74..58787c57 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -50,7 +50,7 @@ def build_midi(): result = subprocess.run(cmd, capture_output=True, text=True, shell=True) all_build_success = result.returncode - with open("midi_build.txt", "wt") as mb: - mb.write(str(result)) + assert all_build_success == 0, f"{result.stderr}\n{result.stdout}" + + return str(Path(__file__).parent / f"test_midi/bin/") - return str(Path(__file__).parent / f"test_midi/bin/") if all_build_success == 0 else False diff --git a/tests/test_midi_tx.py b/tests/test_midi_tx.py index 47915189..605bfba1 100644 --- a/tests/test_midi_tx.py +++ b/tests/test_midi_tx.py @@ -18,11 +18,6 @@ MAX_CYCLES = 15000000 @pytest.mark.parametrize("config", MIDI_TEST_CONFIGS) def test_tx(capfd, config, build_midi): - with open("dir.txt", "wt") as db: - import subprocess - output = subprocess.run("tree", capture_output=True, text=True, shell=True) - db.write(output.stdout) - # Need tempdir as we use the same config files and this causes issues when using xdist with tempdir() as tmpdirname: copy_tree(build_midi, tmpdirname)