diff options
Diffstat (limited to 'src/mailman/testing/layers.py')
| -rw-r--r-- | src/mailman/testing/layers.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/mailman/testing/layers.py b/src/mailman/testing/layers.py index ed0755819..fbb2dfa8a 100644 --- a/src/mailman/testing/layers.py +++ b/src/mailman/testing/layers.py @@ -35,16 +35,15 @@ import logging import datetime import tempfile +from base64 import b64encode from pkg_resources import resource_string from textwrap import dedent -from urllib2 import urlopen, URLError, Request -from base64 import encodestring +from urllib2 import Request, URLError, urlopen from zope.component import getUtility from mailman.config import config from mailman.core import initialize from mailman.core.initialize import INHIBIT_CONFIG_FILE -from mailman.core.i18n import _ from mailman.core.logging import get_handler from mailman.interfaces.domain import IDomainManager from mailman.interfaces.messages import IMessageStore @@ -275,8 +274,10 @@ class RESTLayer(SMTPLayer): while datetime.datetime.now() < until: try: request = Request('http://localhost:8001/3.0/system') - base64string = encodestring('%s:%s' % ("restadmin", "restpass")).replace('\n', '') - request.add_header("Authorization", "Basic %s" % base64string) + basic_auth = '{0}:{1}'.format(config.webservice.admin_user, + config.webservice.admin_pass) + request.add_header('Authorization', + 'Basic ' + b64encode(basic_auth)) fp = urlopen(request) except URLError: pass |