Skip to content

Commit eda4a4c

Browse files
authored
Revert bootloadertrigger change (#52)
1 parent bed1a6d commit eda4a4c

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

FprimeZephyrReference/test/bootloader_trigger.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
11
import os
2-
import signal
32
import subprocess
43
import time
54

65
import pytest
76
from fprime_gds.common.testing_fw.api import IntegrationTestAPI
87

98

10-
@pytest.fixture(scope="session")
9+
@pytest.fixture(scope="session", autouse=True)
1110
def start_gds(fprime_test_api_session: IntegrationTestAPI):
12-
pro = subprocess.Popen(
13-
["make", "gds-integration"],
14-
cwd=os.getcwd(),
15-
stdout=subprocess.PIPE,
16-
preexec_fn=os.setsid,
17-
)
11+
process = subprocess.Popen(["make", "gds-integration"], cwd=os.getcwd())
1812

1913
gds_working = False
2014
timeout_time = time.time() + 30
@@ -30,7 +24,7 @@ def start_gds(fprime_test_api_session: IntegrationTestAPI):
3024
assert gds_working
3125

3226
yield
33-
os.killpg(os.getpgid(pro.pid), signal.SIGTERM)
27+
process.kill()
3428

3529

3630
def test_bootloader(fprime_test_api: IntegrationTestAPI):

0 commit comments

Comments
 (0)