conflicts

h4ndzdatm0ld · Mar 15, 2023 · 6b563c8 · 6b563c8
2 parents 0544384 + 96964f3
commit 6b563c8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,9 +2,9 @@
 version: "3.8"
 services:
   test:
+    network_mode: "host"
     container_name: "test"
     hostname: "test"
-    network_mode: "host"
     environment:
       SKIP_INTEGRATION_TESTS: "${SKIP_INTEGRATION_TESTS:-True}"
       NORNIR_LOG: "${NORNIR_LOG:-False}"

diff --git a/poetry.lock b/poetry.lock
diff --git a/tests/test_data/schema_path/nokia-conf-aaa.yang b/tests/test_data/schema_path/nokia-conf-aaa.yang
@@ -1 +1 @@
-<MagicMock name='connect_ssh().get_schema()' id='140396673009696'>
+<MagicMock name='connect_ssh().get_schema()' id='140203578191600'>
diff --git a/tests/unit/test_netconf_edit_config_unit.py b/tests/unit/test_netconf_edit_config_unit.py
@@ -3,6 +3,9 @@
 
 from nornir_netconf.plugins.tasks import netconf_edit_config
 
+# from nornir_utils.plugins.functions import print_result
+
+
 DEVICE_NAME = "nokia_rtr"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<MagicMock name='connect_ssh().get_schema()' id='140396673009696'>
		<MagicMock name='connect_ssh().get_schema()' id='140203578191600'>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,6 +3,9 @@

		from nornir_netconf.plugins.tasks import netconf_edit_config

		# from nornir_utils.plugins.functions import print_result


		DEVICE_NAME = "nokia_rtr"


Expand Down