Fix and re-enable test_merges

Author: dieriver

Makefile

@@ -30,6 +30,9 @@ install-optional: install
 tests:
 	@${PYTHON} -m pytest -v ${TEST_DIR}/quick
 
+tests_slow:
+	@${PYTHON} -m pytest -v ${TEST_DIR}/slow
+
 tests_all:
 	@${PYTHON} -m pytest -v --capture=tee-sys ${TEST_DIR}
 

tests/slow/merges/test_merges.py

@@ -1,4 +1,6 @@
 import sys
+from pathlib import Path
+
 import pytest
 import os
 import unittest
@@ -148,8 +150,8 @@ def remote_receive_one_qubit(self, virtualNum, cnot_direction=0):
         return bool(correct)
 
 
-@pytest.mark.skip(reason="Uses deprecated internal APIs - needs refactoring to use NetQASM")
-@pytest.mark.skip(reason="Uses deprecated internal APIs - needs updating to new API")
+#@pytest.mark.skip(reason="Uses deprecated internal APIs - needs refactoring to use NetQASM")
+#@pytest.mark.skip(reason="Uses deprecated internal APIs - needs updating to new API")
 class TestMerge(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
@@ -165,7 +167,7 @@ def setUpClass(cls):
         network_config_file = os.path.join(path_to_here, "configs", "network.json")
         network_config.read_from_file(network_config_file)
         nodes = ["Alice", "Bob", "Charlie"]
-        cls.network = Network(nodes=nodes)
+        cls.network = Network(nodes=nodes, network_config_file=Path(network_config_file))
         cls.network.start()
 
     @classmethod
@@ -228,8 +230,8 @@ def run_test(self, nodes_in_class_network: List[str]):
         self.assertTrue(all(results))
 
 
-@pytest.mark.skip(reason="Uses deprecated internal APIs - needs refactoring to use NetQASM")
-@pytest.mark.skip(reason="Uses deprecated internal APIs - needs updating to new API")
+#@pytest.mark.skip(reason="Uses deprecated internal APIs - needs refactoring to use NetQASM")
+#@pytest.mark.skip(reason="Uses deprecated internal APIs - needs updating to new API")
 class TestBothLocal(TestMerge):
     @classmethod
     def setUpClass(cls):
@@ -289,8 +291,8 @@ def test(self):
         self.run_test([])
 
 
-@pytest.mark.skip(reason="Uses deprecated internal APIs - needs refactoring to use NetQASM")
-@pytest.mark.skip(reason="Uses deprecated internal APIs - needs updating to new API")
+#@pytest.mark.skip(reason="Uses deprecated internal APIs - needs refactoring to use NetQASM")
+#@pytest.mark.skip(reason="Uses deprecated internal APIs - needs updating to new API")
 class TestBothLocalNotSameReg(TestBothLocal):
     @classmethod
     @inlineCallbacks
@@ -341,8 +343,8 @@ def alice(cls, qReg, virtRoot, myName, classicalNet, send_end):
         reactor.stop()
 
 
-@pytest.mark.skip(reason="Uses deprecated internal APIs - needs refactoring to use NetQASM")
-@pytest.mark.skip(reason="Uses deprecated internal APIs - needs updating to new API")
+#@pytest.mark.skip(reason="Uses deprecated internal APIs - needs refactoring to use NetQASM")
+#@pytest.mark.skip(reason="Uses deprecated internal APIs - needs updating to new API")
 class TestBothRemote(TestMerge):
     @classmethod
     def setUpClass(cls):
@@ -433,8 +435,8 @@ def test(self):
         self.run_test(["Alice", "Bob", "Charlie"])
 
 
-@pytest.mark.skip(reason="Uses deprecated internal APIs - needs refactoring to use NetQASM")
-@pytest.mark.skip(reason="Uses deprecated internal APIs - needs updating to new API")
+#@pytest.mark.skip(reason="Uses deprecated internal APIs - needs refactoring to use NetQASM")
+#@pytest.mark.skip(reason="Uses deprecated internal APIs - needs updating to new API")
 class TestBothRemoteSameNodeDiffReg(TestMerge):
     @classmethod
     def setUpClass(cls):
@@ -502,8 +504,8 @@ def test(self):
         self.run_test(["Alice", "Bob"])
 
 
-@pytest.mark.skip(reason="Uses deprecated internal APIs - needs refactoring to use NetQASM")
-@pytest.mark.skip(reason="Uses deprecated internal APIs - needs updating to new API")
+#@pytest.mark.skip(reason="Uses deprecated internal APIs - needs refactoring to use NetQASM")
+#@pytest.mark.skip(reason="Uses deprecated internal APIs - needs updating to new API")
 class TestBothRemoteSameNodeSameReg(TestBothRemoteSameNodeDiffReg):
     @staticmethod
     @inlineCallbacks
@@ -547,8 +549,8 @@ def alice(qReg, virtRoot, myName, classicalNet, send_end):
         reactor.stop()
 
 
-@pytest.mark.skip(reason="Uses deprecated internal APIs - needs refactoring to use NetQASM")
-@pytest.mark.skip(reason="Uses deprecated internal APIs - needs updating to new API")
+#@pytest.mark.skip(reason="Uses deprecated internal APIs - needs refactoring to use NetQASM")
+#@pytest.mark.skip(reason="Uses deprecated internal APIs - needs updating to new API")
 class TestRemoteAtoB(TestBothRemoteSameNodeDiffReg):
     @staticmethod
     @inlineCallbacks
@@ -581,8 +583,8 @@ def alice(qReg, virtRoot, myName, classicalNet, send_end):
         reactor.stop()
 
 
-@pytest.mark.skip(reason="Uses deprecated internal APIs - needs refactoring to use NetQASM")
-@pytest.mark.skip(reason="Uses deprecated internal APIs - needs updating to new API")
+#@pytest.mark.skip(reason="Uses deprecated internal APIs - needs refactoring to use NetQASM")
+#@pytest.mark.skip(reason="Uses deprecated internal APIs - needs updating to new API")
 class TestRemoteBtoA(TestBothRemoteSameNodeDiffReg):
     @staticmethod
     @inlineCallbacks