1 files changed, 11 insertions, 21 deletions
diff --git a/lab_control/test/sds1000xe_test.py b/lab_control/test/sds1000xe_test.py
index 1bc1888..7cbee70 100644
--- a/lab_control/test/sds1000xe_test.py
+++ b/lab_control/test/sds1000xe_test.py
@@ -1,34 +1,24 @@
 import pytest
 
 from lab_control.sds1000xe import SDS1000XE
-from lab_control.test.mocksocket import MockSocket
+from lab_control.mock_sds1000xe_server import MockSDS1000XEServer
 
 testIP = "127.0.0.1"
-testPort = 4000
-defaultPort = 5025
 
 @pytest.fixture
-def mockSocket():
-    return MockSocket()
+def mockServer():
+    s = MockSDS1000XEServer()
+    yield s
+    s.stop()
 
 @pytest.fixture
-def uut(mockSocket):
-    return SDS1000XE(testIP, port=testPort, socket=mockSocket)
+def uut(mockServer):
+    return SDS1000XE(testIP)
 
 def test_defaults():
-    mockSocket = MockSocket()
-    assert not mockSocket.connected
-    assert mockSocket.ip == None
-    assert mockSocket.port == None
-
-    uut = SDS1000XE(testIP, socket=mockSocket)
-    assert mockSocket.connected
-    assert mockSocket.ip == testIP
-    assert mockSocket.port == defaultPort
-
-def test_differentPort(uut, mockSocket):
-    assert mockSocket.connected
-    assert mockSocket.ip == testIP
-    assert mockSocket.port == testPort
+    pass
+
+def test_differentPort(uut, mockServer):
+    assert False