diff options
| author | Tomas Krizek <tomas.krizek@nic.cz> | 2019-02-04 12:17:13 +0100 |
|---|---|---|
| committer | Tomas Krizek <tomas.krizek@nic.cz> | 2019-03-12 10:41:55 +0100 |
| commit | 1d1ff8b409030aa5c2f83019268059fe006e21dd (patch) | |
| tree | 765310428187bf9ae3a140135be422ffb042b380 /tests | |
| parent | meson: tests/pytests - compile tls proxy (diff) | |
| download | knot-resolver-1d1ff8b409030aa5c2f83019268059fe006e21dd.tar.xz knot-resolver-1d1ff8b409030aa5c2f83019268059fe006e21dd.zip | |
tests/pytests: use KRESD_EXEC, TLSPROXY_EXEC env vars
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/pytests/kresd.py | 3 | ||||
| -rw-r--r-- | tests/pytests/proxy.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/pytests/kresd.py b/tests/pytests/kresd.py index 607809e1..1e103005 100644 --- a/tests/pytests/kresd.py +++ b/tests/pytests/kresd.py @@ -91,8 +91,9 @@ class Kresd(ContextDecorator): create_file_from_template(KRESD_CONF_TEMPLATE, self.config_path, {'kresd': self}) self.logfile = open(self.logfile_path, 'w') + kresd_exec = os.environ.get('KRESD_EXEC', 'kresd') self.process = subprocess.Popen( - ['kresd', '-c', self.config_path, '-f', '1', self.workdir], + [kresd_exec, '-c', self.config_path, '-f', '1', self.workdir], stdout=self.logfile, env=os.environ.copy()) try: diff --git a/tests/pytests/proxy.py b/tests/pytests/proxy.py index 610ca21a..d436aaa7 100644 --- a/tests/pytests/proxy.py +++ b/tests/pytests/proxy.py @@ -79,7 +79,8 @@ class Proxy(ContextDecorator): class TLSProxy(Proxy): - PATH = os.path.join(PYTESTS_DIR, 'proxy', 'tlsproxy') + PATH = os.environ.get('TLSPROXY_EXEC', os.path.join( + PYTESTS_DIR, '../../build/tests/pytests/tlsproxy')) def __init__( self, |