summaryrefslogtreecommitdiff
path: root/testing/tests/server/test_tac.py
diff options
context:
space:
mode:
authorVictor Shyba <victor1984@riseup.net>2017-08-29 17:05:02 -0300
committerdrebs <drebs@riseup.net>2017-09-05 11:08:47 -0300
commitda26a7f22c6ea77bc417d1184c2a0a4f976669a2 (patch)
treede5e7a86731690a202662120caef64c217a7c607 /testing/tests/server/test_tac.py
parent508fa68d7a2a7d7ef68a39df33b4c57e2260dfe6 (diff)
[style] improve naming and fixes from code review
-- Related: #8867
Diffstat (limited to 'testing/tests/server/test_tac.py')
-rw-r--r--testing/tests/server/test_tac.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/testing/tests/server/test_tac.py b/testing/tests/server/test_tac.py
index e825a9ce..7bb50e35 100644
--- a/testing/tests/server/test_tac.py
+++ b/testing/tests/server/test_tac.py
@@ -45,7 +45,7 @@ class TacServerTestCase(unittest.TestCase):
@defer.inlineCallbacks
def test_local_public_default_ports_on_server_tac(self):
yield self._spawnServer()
- result = yield self._get('http://localhost:2323/incoming')
+ result = yield self._get('http://localhost:2525/incoming')
fail_msg = "Localhost endpoint must require authentication!"
self.assertEquals(401, result.code, fail_msg)
@@ -56,7 +56,7 @@ class TacServerTestCase(unittest.TestCase):
result = yield self._get(public_endpoint_url + 'other')
self.assertEquals(401, result.code, "public server lacks auth!")
- public_using_local_port_url = 'http://%s:2323/' % self._get_public_ip()
+ public_using_local_port_url = 'http://%s:2525/' % self._get_public_ip()
with pytest.raises(Exception):
yield self._get(public_using_local_port_url)
@@ -66,7 +66,8 @@ class TacServerTestCase(unittest.TestCase):
executable = os.path.join(env, 'bin', 'twistd')
no_pid_argument = '--pidfile='
args = [executable, no_pid_argument, '-noy', TAC_FILE_PATH]
- t = reactor.spawnProcess(protocol, executable, args)
+ env = {'DEBUG_SERVER': 'yes'}
+ t = reactor.spawnProcess(protocol, executable, args, env=env)
self.addCleanup(os.kill, t.pid, signal.SIGKILL)
self.addCleanup(t.loseConnection)
return self._sleep(1) # it takes a while to start server