move tests of helpers back to original location, create utils.py for self-tests

bytinbit · bytinbit · commit f003dfdbb4ac · 2021-05-11T17:48:13.000+02:00
diff --git a/tests/base_tests/conftest.py b/tests/base_tests/conftest.py
@@ -8,7 +8,7 @@
 
 from nuts.context import NornirNutsContext, NutsContext
 
-from tests.helpers.selftest_helpers import create_multi_result, create_result
+from tests.utils import create_multi_result, create_result
 
 TIMEOUT_MESSAGE = r"""Traceback (most recent call last):
   File "C:\somepath\lib\site-packages\netmiko\base_connection.py", line 920, in establish_connection
diff --git a/tests/base_tests/test_napalm_bgp_neighbors.py b/tests/base_tests/test_napalm_bgp_neighbors.py
@@ -2,7 +2,7 @@
 from nornir.core.task import AggregatedResult
 
 from nuts.base_tests.napalm_bgp_neighbors import CONTEXT
-from tests.helpers.selftest_helpers import create_multi_result, create_result
+from tests.utils import create_multi_result, create_result
 
 neighbor_details = {
     "local_as": 45001,
diff --git a/tests/base_tests/test_napalm_get_users.py b/tests/base_tests/test_napalm_get_users.py
@@ -2,7 +2,7 @@
 from nornir.core.task import AggregatedResult, MultiResult, Result
 
 from nuts.base_tests.napalm_get_users import CONTEXT
-from tests.helpers.selftest_helpers import create_multi_result, create_result
+from tests.utils import create_multi_result, create_result
 
 test_data = [
     {"host": "R1", "username": "arya", "password": "stark", "level": 11},
diff --git a/tests/base_tests/test_napalm_interfaces.py b/tests/base_tests/test_napalm_interfaces.py
@@ -2,7 +2,7 @@
 from nornir.core.task import AggregatedResult
 
 from nuts.base_tests.napalm_interfaces import CONTEXT
-from tests.helpers.selftest_helpers import create_multi_result, create_result
+from tests.utils import create_multi_result, create_result
 
 nornir_results = [
     {
diff --git a/tests/base_tests/test_napalm_lldp_neighbors.py b/tests/base_tests/test_napalm_lldp_neighbors.py
@@ -2,7 +2,7 @@
 from nornir.core.task import AggregatedResult
 
 from nuts.base_tests.napalm_lldp_neighbors import CONTEXT
-from tests.helpers.selftest_helpers import create_multi_result, create_result
+from tests.utils import create_multi_result, create_result
 
 neighbor_details = {
     "remote_chassis_id": "001e.e611.3500",
diff --git a/tests/base_tests/test_napalm_network_instances.py b/tests/base_tests/test_napalm_network_instances.py
@@ -2,7 +2,7 @@
 from nornir.core.task import AggregatedResult
 
 from nuts.base_tests.napalm_network_instances import CONTEXT
-from tests.helpers.selftest_helpers import create_multi_result, create_result
+from tests.utils import create_multi_result, create_result
 
 nornir_results = [
     {
diff --git a/tests/base_tests/test_napalm_ping.py b/tests/base_tests/test_napalm_ping.py
@@ -3,9 +3,9 @@
 from nornir.core.task import AggregatedResult
 
 from nuts.base_tests.napalm_ping import CONTEXT
-from tests.helpers.selftest_helpers import tupelize
+from tests.utils import tupelize
 from tests.base_tests.conftest import TIMEOUT_MESSAGE
-from tests.helpers.selftest_helpers import create_result, create_multi_result, SelfTestData
+from tests.utils import create_result, create_multi_result, SelfTestData
 
 ping_r1_1 = SelfTestData(
     nornir_raw_result={
diff --git a/tests/base_tests/test_netmiko_cdp_neighbors.py b/tests/base_tests/test_netmiko_cdp_neighbors.py
@@ -2,7 +2,7 @@
 from nornir.core.task import AggregatedResult, MultiResult, Result
 
 from nuts.base_tests.netmiko_cdp_neighbors import CONTEXT
-from tests.helpers.selftest_helpers import create_multi_result, create_result
+from tests.utils import create_multi_result, create_result
 
 neighbor_details = {
     "destination_host": "R2",
diff --git a/tests/base_tests/test_netmiko_iperf.py b/tests/base_tests/test_netmiko_iperf.py
@@ -4,7 +4,7 @@
 
 from nornir.core.task import AggregatedResult
 from nuts.base_tests.netmiko_iperf import CONTEXT
-from tests.helpers.selftest_helpers import create_result, create_multi_result, SelfTestData, tupelize
+from tests.utils import create_result, create_multi_result, SelfTestData, tupelize
 
 iperf_l1_1 = SelfTestData(
     nornir_raw_result='{"start":{"connected":[{"remote_host":"10.0.0.2"}]},"end":{"sum_received":{"bits_per_second":3.298164e09}}}',
diff --git a/tests/base_tests/test_netmiko_ospf_neighbors.py b/tests/base_tests/test_netmiko_ospf_neighbors.py
@@ -2,7 +2,7 @@
 from nornir.core.task import AggregatedResult, MultiResult, Result
 
 from nuts.base_tests.netmiko_ospf_neighbors import CONTEXT
-from tests.helpers.selftest_helpers import create_multi_result, create_result
+from tests.utils import create_multi_result, create_result
 
 neighbor_details = {
     "neighbor_id": "172.16.255.3",
diff --git a/tests/helpers/test_converters.py b/tests/helpers/test_converters.py
diff --git a/tests/helpers/test_result.py b/tests/helpers/test_result.py
diff --git a/tests/test_class_loading.py b/tests/test_class_loading.py
@@ -1,7 +1,7 @@
 from unittest.mock import patch
 
 from nuts.index import ModuleIndex
-from tests.helpers.selftest_helpers import YAML_EXTENSION
+from tests.utils import YAML_EXTENSION
 
 
 def test_load_class_and_execute_tests(testdir):
diff --git a/tests/test_context.py b/tests/test_context.py
@@ -6,7 +6,7 @@
 from nornir.core.plugins.runners import RunnersPluginRegister
 
 from nuts.context import NornirNutsContext, NutsSetupError, NutsContext
-from tests.helpers.selftest_helpers import YAML_EXTENSION
+from tests.utils import YAML_EXTENSION
 
 
 class CustomNornirNutsContext(NornirNutsContext):
diff --git a/tests/test_module_level_fixtures.py b/tests/test_module_level_fixtures.py
@@ -1,4 +1,4 @@
-from tests.helpers.selftest_helpers import YAML_EXTENSION
+from tests.utils import YAML_EXTENSION
 
 
 def test_load_module_fixture(testdir):
diff --git a/tests/test_nuts_annotation.py b/tests/test_nuts_annotation.py
@@ -1,4 +1,4 @@
-from tests.helpers.selftest_helpers import YAML_EXTENSION
+from tests.utils import YAML_EXTENSION
 
 
 def test_skips_execution_without_arguments(testdir):
diff --git a/tests/utils.py b/tests/utils.py

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`from nornir.core.task import AggregatedResult`
`3`	`3`
`4`	`4`	`from nuts.base_tests.napalm_interfaces import CONTEXT`
`5`		`-from tests.helpers.selftest_helpers import create_multi_result, create_result`
	`5`	`+from tests.utils import create_multi_result, create_result`
`6`	`6`
`7`	`7`	`nornir_results = [`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`from nornir.core.task import AggregatedResult`
`3`	`3`
`4`	`4`	`from nuts.base_tests.napalm_network_instances import CONTEXT`
`5`		`-from tests.helpers.selftest_helpers import create_multi_result, create_result`
	`5`	`+from tests.utils import create_multi_result, create_result`
`6`	`6`
`7`	`7`	`nornir_results = [`
`8`	`8`	`{`