summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2015-09-11 11:45:17 +0200
committerRuben Pollan <meskio@sindominio.net>2015-09-15 14:13:24 +0200
commit8384b006f575ac0b769f9f6e9ce6b2c623ec9fa1 (patch)
tree6e2c2366f3b5a87fba270e6f75d48bfc4da3677c /pkg
parent5f2f8a65aba2672ae6661052af2f735ba17ad7a5 (diff)
[test] add test infrastructure
Some refactor on the couchdb usage was needed to be able to mock couchdb. - Resolves: #7435
Diffstat (limited to 'pkg')
-rwxr-xr-xpkg/mx.tac7
-rw-r--r--pkg/requirements-testing.pip1
2 files changed, 2 insertions, 6 deletions
diff --git a/pkg/mx.tac b/pkg/mx.tac
index e85dea5..6f7b104 100755
--- a/pkg/mx.tac
+++ b/pkg/mx.tac
@@ -80,10 +80,6 @@ check_recipient = internet.TCPServer(
check_recipient.setServiceParent(application)
# Mail receiver
-mail_couch_url_prefix = "http://%s:%s@%s:%s" % (user,
- password,
- server,
- port)
directories = []
for section in config.sections():
if section in ("couchdb", "alias map", "check recipient", "bounce"):
@@ -92,6 +88,5 @@ for section in config.sections():
recursive = config.getboolean(section, "recursive")
directories.append([to_watch, recursive])
-mr = MailReceiver(mail_couch_url_prefix, cdb, directories, bounce_from,
- bounce_subject)
+mr = MailReceiver(cdb, directories, bounce_from, bounce_subject)
mr.setServiceParent(application)
diff --git a/pkg/requirements-testing.pip b/pkg/requirements-testing.pip
index 94ab6e8..94b8e9c 100644
--- a/pkg/requirements-testing.pip
+++ b/pkg/requirements-testing.pip
@@ -1 +1,2 @@
pep8
+setuptools-trial