Page MenuHomeDevCentral
Files F11706036

D3663.diff
No OneTemporary
Actions

D3663.diff
View Options

diff --git a/_tests/data/forests.yaml b/_tests/data/forests.yaml
--- a/_tests/data/forests.yaml
+++ b/_tests/data/forests.yaml
@@ -17,8 +17,8 @@
gateway: 1.2.3.254
net02:
ipv4:
- address: 10.100.0.4 #private
- gateway: 10.100.0.1
+ address: 172.27.27.4 #private
+ gateway: 172.27.27.1
entwash:
forest: fangorn
@@ -29,8 +29,8 @@
interfaces:
net02:
ipv4:
- address: 10.100.0.5 #private
- gateway: 10.100.0.1
+ address: 172.27.27.5 #private
+ gateway: 172.27.27.1
items_by_role:
treecity:
diff --git a/_tests/modules/test_node.py b/_tests/modules/test_node.py
--- a/_tests/modules/test_node.py
+++ b/_tests/modules/test_node.py
@@ -108,8 +108,8 @@
(
"entwash",
{
- "ipv4_address": "10.100.0.5",
- "ipv4_gateway": "10.100.0.1",
+ "ipv4_address": "172.27.27.5",
+ "ipv4_gateway": "172.27.27.1",
},
),
)
@@ -117,11 +117,11 @@
@data_provider(resolved_networks)
def test_resolve_network(self, id, expected):
self.grains["id"] = id
- self.assertEqual(expected, node.resolve_network())
+ self.assertIsSubsetDict(expected, node.resolve_network())
def test_resolve_network_without_gateway(self):
expected = {
- "ipv4_address": "10.100.0.5",
+ "ipv4_address": "172.27.27.5",
"ipv4_gateway": "",
}
@@ -130,7 +130,7 @@
"gateway"
]
- self.assertEqual(expected, node.resolve_network())
+ self.assertIsSubsetDict(expected, node.resolve_network())
def test_resolve_network_without_any_network(self):
expected = {
@@ -141,7 +141,12 @@
self.grains["id"] = "entwash"
del self.pillar["nodes"]["entwash"]["network"]
- self.assertEqual(expected, node.resolve_network())
+ self.assertIsSubsetDict(expected, node.resolve_network())
+
+ def assertIsSubsetDict(self, expected, actual):
+ for k, v in expected.items():
+ self.assertIn(k, actual)
+ self.assertEqual(v, actual[k], f"Unexpected value for key {k} in {actual}")
if __name__ == "__main__":

File Metadata

Mime Type
text/plain
Expires
Sat, Sep 13, 22:17 (16 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2983314
Default Alt Text
D3663.diff (2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator