Discovered NOONE had run make tests_all for years (probably not since Axel and I edited this). Marked

merge tests as deprecated for now given the API needs a serious update (updated some but not all now)
This was an amazingly diplomatic comment given what I think about this...

Fixed sdk tests though to work again by using non stabilizer backend

Author: StephanieWehner

tests/slow/merges/configs/Alice.cfg

@@ -1,4 +1,5 @@
 import sys
+import pytest
 import os
 import unittest
 from pathlib import Path
@@ -18,6 +19,8 @@
 from simulaqron.local.setup import setup_local, assemble_qubit
 from simulaqron.network import Network
 from simulaqron.settings import simulaqron_settings
+from simulaqron.settings.network_config import NetworkConfigBuilder
+from simulaqron.settings.network_config import NetworkConfigBuilder
 from simulaqron.settings.simulaqron_config import SimBackend
 from simulaqron.toolbox.stabilizer_states import StabilizerState
 from simulaqron.reactor import reactor
@@ -148,6 +151,8 @@ def remote_receive_one_qubit(self, virtualNum, cnot_direction=0):
 
 
 # @for_all_methods()
+@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):
@@ -169,9 +174,9 @@ def setUpClass(cls):
                 simulaqron_settings.network_config_file = network_def_file.name
                 simulaqron_settings.save_to_file(simulaqron_settings_file.name)
                 nodes = ["Alice", "Bob", "Charlie"]
-                cls.network = Network(nodes=nodes, force=True)
+                cls.network = Network(nodes=nodes, network_config_file=Path(network_def_file.name))
                 cls.network.start()
-        # cls.network = Network(nodes=nodes, force=True)
+        # cls.network = Network(nodes=nodes, network_config_file=Path(network_def_file.name))
         # cls.network.start()
 
     @classmethod
@@ -190,7 +195,7 @@ def tearDownClass(cls):
         network_settings_file.unlink()
 
     @staticmethod
-    def setup_node(name, node_code, classical_net_file, send_end):
+    def setup_node(name, node_code, send_end):
         if simulaqron_settings.log_level == DEBUG:
             stdout_file = open(f"stdout-setup-node-{name}-{os.getpid()}.out.txt", "w")
             stderr_file = open(f"stderr-setup-node-{name}-{os.getpid()}.out.txt", "w")
@@ -200,11 +205,15 @@ def setup_node(name, node_code, classical_net_file, send_end):
         virtualFile = simulaqron_settings.network_config_file
 
         # This file defines the nodes acting as servers in the classical communication network
-        classicalFile = os.path.join(os.path.dirname(__file__), "configs", classical_net_file)
+        classicalFile = virtualFile
 
         # Read configuration files for the virtual quantum, as well as the classical network
-        virtualNet = SocketsConfig(virtualFile)
-        classicalNet = SocketsConfig(classicalFile)
+        virtual_config = NetworkConfigBuilder()
+        virtual_config.read_from_file(virtualFile)
+        virtualNet = SocketsConfig(virtual_config)
+        classical_config = NetworkConfigBuilder()
+        classical_config.read_from_file(classicalFile)
+        classicalNet = SocketsConfig(classical_config)
 
         # Check if we should run a local classical server. If so, initialize the code
         # to handle remote connections on the classical communication network
@@ -218,12 +227,12 @@ def setup_node(name, node_code, classical_net_file, send_end):
         # execute the function runClientNode
         setup_local(name, virtualNet, classicalNet, lNode, node_code, send_end)
 
-    def run_test(self, classical_net_file):
+    def run_test(self):
         pipe_list = []
         for name, node_code in zip(self.nodes, self.node_codes):
             recv_end, send_end = Pipe(False)
             p = Process(target=self.setup_node,
-                        args=[name, node_code, classical_net_file, send_end],
+                        args=[name, node_code, send_end],
                         name=name)
             self.processes.append(p)
             pipe_list.append(recv_end)
@@ -241,6 +250,9 @@ def run_test(self, classical_net_file):
         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 refactoring to use NetQASM")
+@pytest.mark.skip(reason="Uses deprecated internal APIs - needs updating to new API")
 class TestBothLocal(TestMerge):
     @classmethod
     def setUpClass(cls):
@@ -296,9 +308,12 @@ def alice(cls, qReg, virtRoot, myName, classicalNet, send_end):
         reactor.stop()
 
     def test(self):
-        self.run_test("Alice.cfg")
+        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 refactoring to use NetQASM")
+@pytest.mark.skip(reason="Uses deprecated internal APIs - needs updating to new API")
 class TestBothLocalNotSameReg(TestBothLocal):
     @classmethod
     @inlineCallbacks
@@ -349,6 +364,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")
 class TestBothRemote(TestMerge):
     @classmethod
     def setUpClass(cls):
@@ -435,9 +452,11 @@ def charlie(qReg, virtRoot, myName, classicalNet, send_end):
         send_end.send(True)
 
     def test(self):
-        self.run_test("AliceBobCharlie.cfg")
+        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")
 class TestBothRemoteSameNodeDiffReg(TestMerge):
     @classmethod
     def setUpClass(cls):
@@ -501,9 +520,11 @@ def bob(qReg, virtRoot, myName, classicalNet, send_end):
         send_end.send(True)
 
     def test(self):
-        self.run_test("AliceBob.cfg")
+        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")
 class TestBothRemoteSameNodeSameReg(TestBothRemoteSameNodeDiffReg):
     @staticmethod
     @inlineCallbacks
@@ -547,6 +568,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")
 class TestRemoteAtoB(TestBothRemoteSameNodeDiffReg):
     @staticmethod
     @inlineCallbacks
@@ -579,6 +602,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")
 class TestRemoteBtoA(TestBothRemoteSameNodeDiffReg):
     @staticmethod
     @inlineCallbacks

tests/slow/merges/configs/AliceBob.cfg

@@ -12,7 +12,7 @@
 from simulaqron.sdk.connection import SimulaQronConnection
 from netqasm.sdk import Qubit
 from simulaqron.network import Network
-from simulaqron.settings import simulaqron_settings
+from simulaqron.settings import simulaqron_settings, get_default_network_config_file
 
 
 def prep_z0(conn):
@@ -63,7 +63,7 @@ def setUpClass(cls):
         simulaqron_settings.noisy_qubits = True
         simulaqron_settings.t1 = 0.0001
 
-        cls.network = Network(nodes=["Alice"], force=True)
+        cls.network = Network(nodes=["Alice"], network_config_file=get_default_network_config_file(use_embedded=True))
         cls.network.start()
 
     @classmethod

tests/slow/merges/configs/AliceBobCharlie.cfg

@@ -206,12 +206,13 @@ class TestSingleQubitGate:
     @pytest.fixture
     def network(self):
         simulaqron_settings.default_settings()
+        simulaqron_settings.sim_backend = SimBackend.PROJECTQ
         with NamedTemporaryFile(suffix=".json", delete_on_close=False) as net_config_file:
             simulaqron_settings.network_config_file = net_config_file.name
             network_builder = NetworkConfigBuilder()
             network_builder.using_default_network()
             network_builder.write_to_file(net_config_file.name)
-            network = Network(nodes=["Alice"], force=True)
+            network = Network(nodes=["Alice"], network_config_file=get_default_network_config_file(use_embedded=True))
             network.start()
             yield network
 

tests/slow/merges/test_merges.py

@@ -194,7 +194,7 @@ def network(self):
             network_builder.using_default_network()
             network_builder.write_to_file(net_config_file.name)
             net_config_file.close()
-            network = Network(nodes=["Alice", "Bob"], force=True)
+            network = Network(nodes=["Alice", "Bob"], network_config_file=get_default_network_config_file(use_embedded=True))
             network.start(wait_until_running=True)
             yield network