From: Mathieu Trudel-Lapierre Date: Fri, 2 Aug 2019 13:38:24 +0200 Subject: Revise expected values for some tests affected by GLib HashTable weird --- tests/generator/test_bridges.py | 2 +- tests/generator/test_common.py | 2 +- tests/generator/test_vlans.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/generator/test_bridges.py b/tests/generator/test_bridges.py index 4344d37..01340e3 100644 --- a/tests/generator/test_bridges.py +++ b/tests/generator/test_bridges.py @@ -215,7 +215,7 @@ UseMTU=true dhcp4: yes''') self.assert_nm(None, '''[keyfile] # devices managed by networkd -unmanaged-devices+=interface-name:mybr,interface-name:eth42,interface-name:eth43,''') +unmanaged-devices+=interface-name:eth42,interface-name:eth43,interface-name:mybr,''') def test_bridge_components(self): self.generate('''network: diff --git a/tests/generator/test_common.py b/tests/generator/test_common.py index e1f603f..32bc37c 100644 --- a/tests/generator/test_common.py +++ b/tests/generator/test_common.py @@ -1105,7 +1105,7 @@ unmanaged-devices+=interface-name:engreen,''') if "CODECOV_TOKEN" not in os.environ: # pragma: nocover self.assert_nm(None, '''[keyfile] # devices managed by networkd -unmanaged-devices+=interface-name:engreen,interface-name:enblue,''') +unmanaged-devices+=interface-name:enblue,interface-name:engreen,''') self.assert_nm_udev(None) def test_change_def(self): diff --git a/tests/generator/test_vlans.py b/tests/generator/test_vlans.py index d93e230..22006ee 100644 --- a/tests/generator/test_vlans.py +++ b/tests/generator/test_vlans.py @@ -48,9 +48,9 @@ Name=en1 [Network] LinkLocalAddressing=ipv6 -VLAN=enred -VLAN=enblue VLAN=engreen +VLAN=enblue +VLAN=enred ''', 'enblue.netdev': '''[NetDev] Name=enblue @@ -103,7 +103,7 @@ UseMTU=true '''}) self.assert_nm(None, '''[keyfile] # devices managed by networkd -unmanaged-devices+=interface-name:en1,interface-name:enred,interface-name:enblue,interface-name:engreen,''') +unmanaged-devices+=interface-name:engreen,interface-name:en1,interface-name:enblue,interface-name:enred,''') self.assert_nm_udev(None)