Merge pull request #31 from psav/fix_tests

Fixed tests - probably terribly

Author: matburt

receptor/config.py

@@ -124,7 +124,7 @@ def __init__(self, args=None):
             key='peers',
             short_option='-p',
             long_option='--peer',
-            default_value=None,
+            default_value=[],
             value_type='list',
             listof='str',
             hint='Set/override peer nodes/controllers to connect to. Use multiple times for multiple peers.',

test/integration/test_main.py

@@ -9,33 +9,34 @@
 
 
 @pytest.fixture
-def receptor_config(unused_tcp_port):
-    config = dict()
-    config.setdefault('server', {})['port'] = unused_tcp_port
-    return ReceptorConfig(cmdline_args=config)
-    
+def receptor_config(unused_tcp_port, tmpdir, type="node"):
+    return ReceptorConfig(['--data-dir', tmpdir.strpath, type, '--listen-port', str(unused_tcp_port)])
+
 
 @pytest.fixture
 def receptor_service(receptor_config):
     return Receptor(config=receptor_config, node_id='A')
 
 
 @pytest.fixture
-def receptor_service_factory(unused_tcp_port_factory):
-    def _receptor_service(node_name, peer_ports=[]):
-        config = dict()
-        config.setdefault('server', {})['port'] = unused_tcp_port_factory()
-        config['peers'] = {'127.0.0.1:{}'.format(p): '' for p in peer_ports}
-        receptor_config = ReceptorConfig(cmdline_args=config)
-        return Receptor(config=receptor_config, node_id=node_name)
+def receptor_service_factory(unused_tcp_port_factory, tmpdir):
+    def _receptor_service(node_name, peer_ports=[], type="node"):
+        peers = {'127.0.0.1:{}'.format(p): '' for p in peer_ports}
+        peer_config = []
+        for peer in peers:
+            peer_config.extend(['--peer', peer])
+        base_config = ['--node-id', node_name, '--data-dir', tmpdir.strpath, type, '--listen-port', str(unused_tcp_port_factory())]
+        base_config.extend(peer_config)
+        receptor_config = ReceptorConfig(base_config)
+        return Receptor(receptor_config)
     return _receptor_service
 
 
 async def connect_port(receptor_obj):
     n = 5
     while n:
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        result = sock.connect_ex(('127.0.0.1',receptor_obj.config.server.port))
+        result = sock.connect_ex(('127.0.0.1',receptor_obj.config.node_listen_port))
         if result != 0:
             await asyncio.sleep(1)
             n = n - 1
@@ -51,15 +52,15 @@ async def wait_for_time(seconds):
 @patch.object(receptor.protocol.BasicProtocol, 'connection_made')
 def test_main_node(mock_connection_made, event_loop, receptor_service):
     event_loop.call_soon(event_loop.create_task, connect_port(receptor_service))
-    mainloop(receptor=receptor_service, loop=event_loop)
+    mainloop(receptor=receptor_service, ping_interval=-1, loop=event_loop)
     mock_connection_made.assert_called_once()
 
 
 def test_peering(event_loop, receptor_service_factory):
-    r1 = receptor_service_factory('A')
-    r2 = receptor_service_factory('B', peer_ports=[r1.config.server.port])
-    mainloop(receptor=r1, loop=event_loop, skip_run=True)
-    mainloop(receptor=r2, loop=event_loop, skip_run=True)
+    r1 = receptor_service_factory('A', type="controller")
+    r2 = receptor_service_factory('B', peer_ports=[r1.config.node_listen_port])
+    mainloop(receptor=r1, ping_interval=-1, loop=event_loop, skip_run=True)
+    mainloop(receptor=r2, ping_interval=-1, loop=event_loop, skip_run=True)
     event_loop.run_until_complete(wait_for_time(10))
     assert r1.router.node_is_known('B')
     assert r2.router.node_is_known('A')