summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorBruno Wagner <bwgpro@gmail.com>2015-06-03 13:44:44 -0300
committerBruno Wagner <bwgpro@gmail.com>2015-06-03 13:44:44 -0300
commit94340022da52f3b0c6aa27308ef155a6659c3269 (patch)
tree00ef036f2f3fc9aae61e8ad2a65fd276f7167152 /service
parent0add937d3b1f6cbe874b5960cf89b1a9ab9dac97 (diff)
Dispatcher tests were not reflecting the args parser changes
Diffstat (limited to 'service')
-rw-r--r--service/pixelated/maintenance.py1
-rw-r--r--service/test/unit/config/test_dispatcher.py6
2 files changed, 3 insertions, 4 deletions
diff --git a/service/pixelated/maintenance.py b/service/pixelated/maintenance.py
index 22cc9cb9..a49dc89d 100644
--- a/service/pixelated/maintenance.py
+++ b/service/pixelated/maintenance.py
@@ -33,7 +33,6 @@ from pixelated.config.initialize_leap import initialize_leap
from pixelated.config.loading_page import loading
from pixelated.config.register import register
from pixelated.config.logging_setup import init_logging
-from pixelated.config.leap_cert import init_leap_cert
from pixelated.config.soledad import init_soledad_and_user_key
from twisted.internet import reactor, defer
from twisted.internet.threads import deferToThread
diff --git a/service/test/unit/config/test_dispatcher.py b/service/test/unit/config/test_dispatcher.py
index 8bb4bbc4..e154ac22 100644
--- a/service/test/unit/config/test_dispatcher.py
+++ b/service/test/unit/config/test_dispatcher.py
@@ -5,7 +5,7 @@ import sys
from mockito import mock, when
import os
from pixelated.config.config import Config
-from pixelated.config.args import parse as parse_args
+from pixelated.config.args import parse_user_agent_args
from pixelated.config.dispatcher import config_dispatcher
@@ -20,7 +20,7 @@ class TestConfigDispatcher(unittest.TestCase):
fifo_path = '/tmp/credentials-pipe'
sys.argv = ['tmp/does_not_exist', '--dispatcher', fifo_path]
- args = parse_args()
+ args = parse_user_agent_args()
self._mkfifo(fifo_path)
@@ -38,7 +38,7 @@ class TestConfigDispatcher(unittest.TestCase):
try:
sys.argv = ['tmp/does_not_exist', '--dispatcher-stdin']
- args = parse_args()
+ args = parse_user_agent_args()
provider, user, password = config_dispatcher(args.dispatcher)