diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-02 18:49:40 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-03 21:11:32 +0100 |
| commit | f0dfb50381d8d5210681eba76b2625926deec6f6 (patch) | |
| tree | 36c9cd3a4d92bb0d7975dc34ac12c33c7e7244a7 | |
| parent | dcf62ffcdb53428d3eeaa70aca30a7959b08ec17 (diff) | |
Automatically pick up idletest.key, idletest.cert from G_TEST_SRCDIR
| -rw-r--r-- | tests/twisted/idletest.py | 5 | ||||
| -rw-r--r-- | tests/twisted/run-test.sh.in | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/tests/twisted/idletest.py b/tests/twisted/idletest.py index d60e774..c85acfb 100644 --- a/tests/twisted/idletest.py +++ b/tests/twisted/idletest.py @@ -159,8 +159,9 @@ class SSLIRCServer(BaseIRCServer): def listen(self, port, factory): self.log ("SSLIRCServer listening...") - key_file = os.environ.get('IDLE_SSL_KEY', 'tools/idletest.key') - cert_file = os.environ.get('IDLE_SSL_CERT', 'tools/idletest.cert') + G_TEST_SRCDIR = os.environ.get('G_TEST_SRCDIR', '.') + key_file = G_TEST_SRCDIR + '/tools/idletest.key' + cert_file = G_TEST_SRCDIR + '/tools/idletest.cert' return reactor.listenSSL(port, factory, ssl.DefaultOpenSSLContextFactory(key_file, cert_file)) diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in index cfca4a9..9faa55e 100644 --- a/tests/twisted/run-test.sh.in +++ b/tests/twisted/run-test.sh.in @@ -34,10 +34,6 @@ else fi config_file="${G_TEST_BUILDDIR}/tools/tmp-session-bus.conf" -IDLE_SSL_KEY=${G_TEST_SRCDIR}/tools/idletest.key -export IDLE_SSL_KEY -IDLE_SSL_CERT=${G_TEST_SRCDIR}/tools/idletest.cert -export IDLE_SSL_CERT # Turn off anti-flooding to hurry the tests up (without this, # channels/join-muc-channel-bouncer.py will time out, and the rest |