clients/tests: fix unstable tests for Python2 vs. Python3

Currently, nmcli does not sort the list of available connections
for display. Instead, it shows them in the order as NetworkManager
exposes them on D-Bus.

Previously, test-networkmanager-service.py, would generate the list
of available connections by iterating the connections dictionary.
In Python (at least until Python 3.6), the order when iterating over
dictionaries is undefined. This inconsistancy lets tests behave
differently depending on the python version. Possibly with Python
3.4 and 3.5, tests might even behave differently between individual
runs (since Python there uses siphash with a randomized hash seed).

12 files changed, 48 insertions, 48 deletions

diff --git a/clients/tests/test-client.check-on-disk/test_003-030.expected b/clients/tests/test-client.check-on-disk/test_003-030.expected
index 74fdcc2487..f1cbde6948 100644
--- a/clients/tests/test-client.check-on-disk/test_003-030.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-030.expected
@@ -55,10 +55,10 @@ DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
 DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-031.expected b/clients/tests/test-client.check-on-disk/test_003-031.expected
index a746e81661..1b72213135 100644
--- a/clients/tests/test-client.check-on-disk/test_003-031.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-031.expected
@@ -55,10 +55,10 @@ DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
 DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-032.expected b/clients/tests/test-client.check-on-disk/test_003-032.expected
index f0485169d8..7d48972fc4 100644
--- a/clients/tests/test-client.check-on-disk/test_003-032.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-032.expected
@@ -55,10 +55,10 @@ DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
 DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{3,2,1}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-033.expected b/clients/tests/test-client.check-on-disk/test_003-033.expected
index 291d424923..9097c18898 100644
--- a/clients/tests/test-client.check-on-disk/test_003-033.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-033.expected
@@ -55,10 +55,10 @@ DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
 DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{3,2,1}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-053.expected b/clients/tests/test-client.check-on-disk/test_003-053.expected
index a0b562bd8e..57563e1343 100644
--- a/clients/tests/test-client.check-on-disk/test_003-053.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-053.expected
@@ -55,10 +55,10 @@ DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
 DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-054.expected b/clients/tests/test-client.check-on-disk/test_003-054.expected
index 3feb0e887c..219d57f719 100644
--- a/clients/tests/test-client.check-on-disk/test_003-054.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-054.expected
@@ -55,10 +55,10 @@ DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
 DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-055.expected b/clients/tests/test-client.check-on-disk/test_003-055.expected
index 1c34c05ac2..5518745d2e 100644
--- a/clients/tests/test-client.check-on-disk/test_003-055.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-055.expected
@@ -55,10 +55,10 @@ DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
 DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{3,2,1}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-056.expected b/clients/tests/test-client.check-on-disk/test_003-056.expected
index c2d284c8fa..6d761c8ad0 100644
--- a/clients/tests/test-client.check-on-disk/test_003-056.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-056.expected
@@ -55,10 +55,10 @@ DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6
 DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{3,2,1}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-077.expected b/clients/tests/test-client.check-on-disk/test_003-077.expected
index 32c12c598d..28f8c47c08 100644
--- a/clients/tests/test-client.check-on-disk/test_003-077.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-077.expected
@@ -55,10 +55,10 @@ DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
 DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-078.expected b/clients/tests/test-client.check-on-disk/test_003-078.expected
index d964f7671a..bd9de3cbd0 100644
--- a/clients/tests/test-client.check-on-disk/test_003-078.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-078.expected
@@ -55,10 +55,10 @@ DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
 DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   UUID-ethernet-REPLACED-REPLACED-REPL | ethernet
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-099.expected b/clients/tests/test-client.check-on-disk/test_003-099.expected
index d4885b1298..b50f91d44f 100644
--- a/clients/tests/test-client.check-on-disk/test_003-099.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-099.expected
@@ -55,10 +55,10 @@ DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
 DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   (null) | (null)
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   (null) | (null)
 
 <<<
 stderr: 0 bytes
diff --git a/clients/tests/test-client.check-on-disk/test_003-100.expected b/clients/tests/test-client.check-on-disk/test_003-100.expected
index a87b42f7b1..415435583f 100644
--- a/clients/tests/test-client.check-on-disk/test_003-100.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-100.expected
@@ -55,10 +55,10 @@ DHCP6.OPTION[1]:                        dhcp-6-opt-1 = val-1
 DHCP6.OPTION[2]:                        dhcp-6-opt-5 = val-5
 DHCP6.OPTION[3]:                        dhcp-6-opt-6 = val-6
 DHCP6.OPTION[4]:                        dhcp-6-opt-8 = val-8
-CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1}
-CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   (null) | (null)
-CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
-CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2,1,3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1
+CONNECTIONS.AVAILABLE-CONNECTIONS[3]:   (null) | (null)
 
 <<<
 stderr: 0 bytes