Fix error in windows network plugins

[wbi-ocd]

Fix issue #951

[JSCU-CNI]

I can confirm this fixes the issue introduced by our changes in #870.

[JSCU-CNI]

Could you apply the following patch to the test file tests/plugins/os/windows/test_network.py?

diff --git a/tests/plugins/os/windows/test_network.py b/tests/plugins/os/windows/test_network.py
index a9237fc..2eac5bd 100644
--- a/tests/plugins/os/windows/test_network.py
+++ b/tests/plugins/os/windows/test_network.py
@@ -257,7 +257,7 @@ def test_windows_network_none(
                 "DhcpIPAddress": "192.168.0.10",
                 "IPAddress": "10.0.0.10",
                 "DhcpNameServer": "192.168.0.2",
-                "NameServer": "10.0.0.2",
+                "NameServer": "10.0.0.2 10.0.0.3",
                 "SubnetMask": "255.255.255.0",
                 "DhcpSubnetMask": "255.255.255.0",
                 "VlanID": 10,
@@ -285,7 +285,7 @@ def test_windows_network_none(
                 },
                 {
                     "ip": ["10.0.0.10"],
-                    "dns": ["10.0.0.2"],
+                    "dns": ["10.0.0.3", "10.0.0.2"],
                     "gateway": ["10.0.0.1"],
                     "mac": ["FE:EE:EE:EE:EE:ED"],
                     "subnetmask": ["255.255.255.0"],

[wbi-ocd]

Patch has been applied

[wbi-ocd]

Changes applied

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 77.91%. Comparing base (f0f0aea) to head (7757897).
Report is 1 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main     #955   +/-   ##
=======================================
  Coverage   77.91%   77.91%           
=======================================
  Files         324      324           
  Lines       27865    27869    +4     
=======================================
+ Hits        21710    21714    +4     
  Misses       6155     6155           

Flag	Coverage Δ
unittests	77.91% <100.00%> (+<0.01%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[Schamper]

Can you look at why the unit tests are failing?

[JSCU-CNI]

Seems to be a race condition. The following should fix it:

diff --git a/tests/plugins/os/windows/test_network.py b/tests/plugins/os/windows/test_network.py
index a9237fc..5a7898d 100644
--- a/tests/plugins/os/windows/test_network.py
+++ b/tests/plugins/os/windows/test_network.py
@@ -285,7 +285,7 @@ def test_windows_network_none(
                 },
                 {
                     "ip": ["10.0.0.10"],
-                    "dns": ["10.0.0.3", "10.0.0.2"],
+                    "dns": ["10.0.0.2", "10.0.0.3"],
                     "gateway": ["10.0.0.1"],
                     "mac": ["FE:EE:EE:EE:EE:ED"],
                     "subnetmask": ["255.255.255.0"],
@@ -346,8 +346,8 @@ def test_network_dhcp_and_static(
             gateways.update(interface.gateway)
             macs.update(interface.mac)
 
-            assert interface.ip == expected["ip"]
-            assert interface.dns == expected["dns"]
+            assert sorted(map(str, interface.ip)) == expected["ip"]
+            assert sorted(map(str, interface.dns)) == expected["dns"]
             assert interface.gateway == expected["gateway"]
             assert interface.mac == expected["mac"]
             assert interface.network == expected["network"]

[wbi-ocd]

Done