diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-26 12:36:17 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-26 12:37:58 +0000 |
| commit | fd617b3eb50bdf9b5e54901681e1408aa0949354 (patch) | |
| tree | b129c9421221d71dcd4a0ae485d4f65d2b7fbe50 | |
| parent | e538c1a52ff09df267743d37f6fa9187bb36b349 (diff) | |
Remove GABBLE_TWISTED_PATH, use G_TEST_SRCDIR
| -rw-r--r-- | tests/twisted/run-test.sh.in | 6 | ||||
| -rw-r--r-- | tests/twisted/tls/server-tls-channel.py | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/tests/twisted/run-test.sh.in b/tests/twisted/run-test.sh.in index 29d27aecb..20dafc085 100644 --- a/tests/twisted/run-test.sh.in +++ b/tests/twisted/run-test.sh.in @@ -16,9 +16,6 @@ if test "x$GABBLE_TEST_UNINSTALLED" = x; then PYTHONPATH="@twistedtestsdir@:@twistedtestsdir@/jingle" export PYTHONPATH - - GABBLE_TWISTED_PATH="@twistedtestsdir@" - export GABBLE_TWISTED_PATH else if test -z "$G_TEST_SRCDIR"; then echo "G_TEST_SRCDIR must be set" >&2 @@ -35,9 +32,6 @@ else PYTHONPATH="$PYTHONPATH:${G_TEST_SRCDIR}/jingle" PYTHONPATH="$PYTHONPATH:${G_TEST_BUILDDIR}/jingle" export PYTHONPATH - - GABBLE_TWISTED_PATH="${G_TEST_SRCDIR}" - export GABBLE_TWISTED_PATH fi if [ -n "$1" ] ; then diff --git a/tests/twisted/tls/server-tls-channel.py b/tests/twisted/tls/server-tls-channel.py index fb2d2d85d..0e09fb5f9 100644 --- a/tests/twisted/tls/server-tls-channel.py +++ b/tests/twisted/tls/server-tls-channel.py @@ -34,8 +34,8 @@ JID = "test@example.org" # the files are copied from wocky/tests/certs/tls-[cert,key].pem CA_CERT_HOSTNAME = 'weasel-juice.org' -CA_CERT = os.environ.get('GABBLE_TWISTED_PATH', '.') + '/tls-cert.pem' -CA_KEY = os.environ.get('GABBLE_TWISTED_PATH', '.') + '/tls-key.pem' +CA_CERT = os.environ.get('G_TEST_SRCDIR', '.') + '/tls-cert.pem' +CA_KEY = os.environ.get('G_TEST_SRCDIR', '.') + '/tls-key.pem' class TlsAuthenticator(XmppAuthenticator): def __init__(self, username, password, resource=None): |