summaryrefslogtreecommitdiff
path: root/src/mailman/testing
diff options
context:
space:
mode:
authorBarry Warsaw2010-12-22 17:41:21 -0500
committerBarry Warsaw2010-12-22 17:41:21 -0500
commit42715ec95d8c512399326fe127648e9af4df57c9 (patch)
treea5101d3eaff91a0863851536296447b8a75dd7b8 /src/mailman/testing
parent506ddd3af859ebb9d6b8fcf746b286a030a0b927 (diff)
downloadmailman-42715ec95d8c512399326fe127648e9af4df57c9.tar.gz
mailman-42715ec95d8c512399326fe127648e9af4df57c9.tar.zst
mailman-42715ec95d8c512399326fe127648e9af4df57c9.zip
Insulate the test environment from the running environment. Sadly, the test
ports are still hard coded. Also, 'bin/mailman info' dumps the REST root url and credentials.
Diffstat (limited to 'src/mailman/testing')
-rw-r--r--src/mailman/testing/layers.py2
-rw-r--r--src/mailman/testing/testing.cfg4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/mailman/testing/layers.py b/src/mailman/testing/layers.py
index fbb2dfa8a..b26c93830 100644
--- a/src/mailman/testing/layers.py
+++ b/src/mailman/testing/layers.py
@@ -273,7 +273,7 @@ class RESTLayer(SMTPLayer):
until = datetime.datetime.now() + TEST_TIMEOUT
while datetime.datetime.now() < until:
try:
- request = Request('http://localhost:8001/3.0/system')
+ request = Request('http://localhost:9001/3.0/system')
basic_auth = '{0}:{1}'.format(config.webservice.admin_user,
config.webservice.admin_pass)
request.add_header('Authorization',
diff --git a/src/mailman/testing/testing.cfg b/src/mailman/testing/testing.cfg
index 8c56d2135..e3f642d71 100644
--- a/src/mailman/testing/testing.cfg
+++ b/src/mailman/testing/testing.cfg
@@ -19,8 +19,12 @@
[mta]
smtp_port: 9025
+lmtp_port: 9024
incoming: mailman.testing.mta.FakeMTA
+[webservice]
+port: 9001
+
[qrunner.archive]
max_restarts: 1