summaryrefslogtreecommitdiffstats
path: root/lab_control/test
diff options
context:
space:
mode:
authorEddy Pedroni <eddy@0xf7.com>2022-06-05 16:49:33 +0200
committerEddy Pedroni <eddy@0xf7.com>2022-06-05 16:49:33 +0200
commitd37252c9b6044ce540db54e8b480a85dfc1ec25d (patch)
tree74d9c6381dc5f37ed76be42995852e817755c371 /lab_control/test
parented42c1a47bc96f6453bb50008481d3467e9254e6 (diff)
Moved mocks to separate module
Diffstat (limited to 'lab_control/test')
-rw-r--r--lab_control/test/frequency_response_test.py2
-rw-r--r--lab_control/test/jds6600_unittest.py2
-rw-r--r--lab_control/test/mock/__init__.py0
-rw-r--r--lab_control/test/mock/mock_jds6600_device.py (renamed from lab_control/test/mock_jds6600_device.py)0
-rw-r--r--lab_control/test/mock/mock_lab.py (renamed from lab_control/test/mock_lab.py)0
-rw-r--r--lab_control/test/mock/mock_sds1000xe_device.py (renamed from lab_control/test/mock_sds1000xe_device.py)0
-rw-r--r--lab_control/test/mock/virtual_serial_port.py (renamed from lab_control/test/virtual_serial_port.py)0
-rw-r--r--lab_control/test/mock/virtual_tcp_server.py (renamed from lab_control/test/virtual_tcp_server.py)0
-rw-r--r--lab_control/test/sds1000xe_unittest.py2
9 files changed, 3 insertions, 3 deletions
diff --git a/lab_control/test/frequency_response_test.py b/lab_control/test/frequency_response_test.py
index d694887..eb7d0d0 100644
--- a/lab_control/test/frequency_response_test.py
+++ b/lab_control/test/frequency_response_test.py
@@ -1,6 +1,6 @@
import pytest
-from lab_control.test.mock_lab import MockLab
+from lab_control.test.mock.mock_lab import MockLab
from lab_control.frequency_response import FrequencyResponseMeasurement
from lab_control.measurement import getLinearRange
from lab_control.function_generator import FunctionGenerator
diff --git a/lab_control/test/jds6600_unittest.py b/lab_control/test/jds6600_unittest.py
index c3b283b..476514b 100644
--- a/lab_control/test/jds6600_unittest.py
+++ b/lab_control/test/jds6600_unittest.py
@@ -1,7 +1,7 @@
import pytest
from lab_control.jds6600 import JDS6600
-from lab_control.test.mock_jds6600_device import MockJDS6600Device
+from lab_control.test.mock.mock_jds6600_device import MockJDS6600Device
from lab_control.connection.direct_connection import DirectConnection as MockConnection
@pytest.fixture
diff --git a/lab_control/test/mock/__init__.py b/lab_control/test/mock/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lab_control/test/mock/__init__.py
diff --git a/lab_control/test/mock_jds6600_device.py b/lab_control/test/mock/mock_jds6600_device.py
index 8b7b440..8b7b440 100644
--- a/lab_control/test/mock_jds6600_device.py
+++ b/lab_control/test/mock/mock_jds6600_device.py
diff --git a/lab_control/test/mock_lab.py b/lab_control/test/mock/mock_lab.py
index 1016b92..1016b92 100644
--- a/lab_control/test/mock_lab.py
+++ b/lab_control/test/mock/mock_lab.py
diff --git a/lab_control/test/mock_sds1000xe_device.py b/lab_control/test/mock/mock_sds1000xe_device.py
index 04ec07a..04ec07a 100644
--- a/lab_control/test/mock_sds1000xe_device.py
+++ b/lab_control/test/mock/mock_sds1000xe_device.py
diff --git a/lab_control/test/virtual_serial_port.py b/lab_control/test/mock/virtual_serial_port.py
index f46e29c..f46e29c 100644
--- a/lab_control/test/virtual_serial_port.py
+++ b/lab_control/test/mock/virtual_serial_port.py
diff --git a/lab_control/test/virtual_tcp_server.py b/lab_control/test/mock/virtual_tcp_server.py
index 07a4345..07a4345 100644
--- a/lab_control/test/virtual_tcp_server.py
+++ b/lab_control/test/mock/virtual_tcp_server.py
diff --git a/lab_control/test/sds1000xe_unittest.py b/lab_control/test/sds1000xe_unittest.py
index ce87a6e..b05b901 100644
--- a/lab_control/test/sds1000xe_unittest.py
+++ b/lab_control/test/sds1000xe_unittest.py
@@ -2,7 +2,7 @@ import pytest
from lab_control.sds1000xe import SDS1000XE
from lab_control.connection.direct_connection import DirectConnection as MockConnection
-from lab_control.test.mock_sds1000xe_device import MockSDS1000XEDevice
+from lab_control.test.mock.mock_sds1000xe_device import MockSDS1000XEDevice
@pytest.fixture
def mockDevice():