diff options
Diffstat (limited to 'tests/integration/harness.py')
| -rw-r--r-- | tests/integration/harness.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/integration/harness.py b/tests/integration/harness.py index 10aa6de..e5ec621 100644 --- a/tests/integration/harness.py +++ b/tests/integration/harness.py | |||
| @@ -77,7 +77,7 @@ def free_port(attempts=50): | |||
| 77 | class Tracker: | 77 | class Tracker: |
| 78 | """One tracker process, listening on loopback.""" | 78 | """One tracker process, listening on loopback.""" |
| 79 | 79 | ||
| 80 | def __init__(self, extra_config="", files=None): | 80 | def __init__(self, extra_config="", files=None, extra_args=()): |
| 81 | self.port = free_port() | 81 | self.port = free_port() |
| 82 | # Only used by a config that asks for live sync, but allocated either | 82 | # Only used by a config that asks for live sync, but allocated either |
| 83 | # way so {livesync_port} always resolves. | 83 | # way so {livesync_port} always resolves. |
| @@ -99,7 +99,8 @@ class Tracker: | |||
| 99 | # where LeakSanitizer exists and off where it does not. Asking for it | 99 | # where LeakSanitizer exists and off where it does not. Asking for it |
| 100 | # by name makes the tracker refuse to start on macOS and FreeBSD. | 100 | # by name makes the tracker refuse to start on macOS and FreeBSD. |
| 101 | environment = dict(os.environ, ASAN_OPTIONS="abort_on_error=0") | 101 | environment = dict(os.environ, ASAN_OPTIONS="abort_on_error=0") |
| 102 | self.process = subprocess.Popen([TRACKER, "-f", self.config], stdout=self.log, stderr=self.log, env=environment) | 102 | argv = [TRACKER, "-f", self.config] + [str(a) for a in extra_args] |
| 103 | self.process = subprocess.Popen(argv, stdout=self.log, stderr=self.log, env=environment) | ||
| 103 | self._wait_for_port() | 104 | self._wait_for_port() |
| 104 | except BaseException: | 105 | except BaseException: |
| 105 | self._cleanup() | 106 | self._cleanup() |
