summary refs log tree commit diff
path: root/clients/tests
diff options
context:
space:
mode:
Diffstat (limited to 'clients/tests')
-rw-r--r--clients/tests/test-client.check-on-disk/Makefile.am114
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-001.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-002.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-003.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-004.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-005.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-006.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-007.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-008.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-009.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-010.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-011.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-012.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-013.expected28
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-014.expected28
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-015.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-016.expected29
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-017.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-018.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-019.expected28
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-020.expected28
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-021.expected44
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-022.expected44
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-023.expected63
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-024.expected63
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-025.expected44
-rw-r--r--clients/tests/test-client.check-on-disk/test_001-026.expected44
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-001.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-002.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-003.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-004.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-005.expected39
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-006.expected41
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-007.expected36
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-008.expected36
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-009.expected42
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-010.expected42
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-011.expected36
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-012.expected36
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-013.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-014.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-015.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-016.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-017.expected15
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-018.expected15
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-019.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-020.expected21
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-021.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-022.expected14
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-023.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_002-024.expected33
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-001.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-002.expected15
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-003.expected15
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-004.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-005.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-006.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-007.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-008.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-009.expected22
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-010.expected22
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-011.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-012.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-013.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-014.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-015.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-016.expected90
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-017.expected90
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-018.expected102
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-019.expected102
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-020.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-021.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-022.expected42
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-023.expected42
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-024.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-025.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-026.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-027.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-028.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-029.expected90
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-030.expected90
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-031.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-032.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-033.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-034.expected19
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-035.expected42
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-036.expected42
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-037.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-038.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-039.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-040.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-041.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-042.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-043.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-044.expected18
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-045.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-046.expected24
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-047.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-048.expected16
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-049.expected15
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-050.expected15
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-051.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-052.expected20
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-053.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_003-054.expected115
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-001.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-002.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-003.expected12
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-004.expected12
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-005.expected13
-rw-r--r--clients/tests/test-client.check-on-disk/test_004-006.expected12
-rwxr-xr-xclients/tests/test-client.py856
112 files changed, 4315 insertions, 0 deletions
diff --git a/clients/tests/test-client.check-on-disk/Makefile.am b/clients/tests/test-client.check-on-disk/Makefile.am
new file mode 100644
index 00000000..aa49eda6
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/Makefile.am
@@ -0,0 +1,114 @@
+# generated with `NM_TEST_REGENERATE=1 make check`
+
+clients_tests_expected_files = \
+	clients/tests/test-client.check-on-disk/test_001-001.expected \
+	clients/tests/test-client.check-on-disk/test_001-002.expected \
+	clients/tests/test-client.check-on-disk/test_001-003.expected \
+	clients/tests/test-client.check-on-disk/test_001-004.expected \
+	clients/tests/test-client.check-on-disk/test_001-005.expected \
+	clients/tests/test-client.check-on-disk/test_001-006.expected \
+	clients/tests/test-client.check-on-disk/test_001-007.expected \
+	clients/tests/test-client.check-on-disk/test_001-008.expected \
+	clients/tests/test-client.check-on-disk/test_001-009.expected \
+	clients/tests/test-client.check-on-disk/test_001-010.expected \
+	clients/tests/test-client.check-on-disk/test_001-011.expected \
+	clients/tests/test-client.check-on-disk/test_001-012.expected \
+	clients/tests/test-client.check-on-disk/test_001-013.expected \
+	clients/tests/test-client.check-on-disk/test_001-014.expected \
+	clients/tests/test-client.check-on-disk/test_001-015.expected \
+	clients/tests/test-client.check-on-disk/test_001-016.expected \
+	clients/tests/test-client.check-on-disk/test_001-017.expected \
+	clients/tests/test-client.check-on-disk/test_001-018.expected \
+	clients/tests/test-client.check-on-disk/test_001-019.expected \
+	clients/tests/test-client.check-on-disk/test_001-020.expected \
+	clients/tests/test-client.check-on-disk/test_001-021.expected \
+	clients/tests/test-client.check-on-disk/test_001-022.expected \
+	clients/tests/test-client.check-on-disk/test_001-023.expected \
+	clients/tests/test-client.check-on-disk/test_001-024.expected \
+	clients/tests/test-client.check-on-disk/test_001-025.expected \
+	clients/tests/test-client.check-on-disk/test_001-026.expected \
+	clients/tests/test-client.check-on-disk/test_002-001.expected \
+	clients/tests/test-client.check-on-disk/test_002-002.expected \
+	clients/tests/test-client.check-on-disk/test_002-003.expected \
+	clients/tests/test-client.check-on-disk/test_002-004.expected \
+	clients/tests/test-client.check-on-disk/test_002-005.expected \
+	clients/tests/test-client.check-on-disk/test_002-006.expected \
+	clients/tests/test-client.check-on-disk/test_002-007.expected \
+	clients/tests/test-client.check-on-disk/test_002-008.expected \
+	clients/tests/test-client.check-on-disk/test_002-009.expected \
+	clients/tests/test-client.check-on-disk/test_002-010.expected \
+	clients/tests/test-client.check-on-disk/test_002-011.expected \
+	clients/tests/test-client.check-on-disk/test_002-012.expected \
+	clients/tests/test-client.check-on-disk/test_002-013.expected \
+	clients/tests/test-client.check-on-disk/test_002-014.expected \
+	clients/tests/test-client.check-on-disk/test_002-015.expected \
+	clients/tests/test-client.check-on-disk/test_002-016.expected \
+	clients/tests/test-client.check-on-disk/test_002-017.expected \
+	clients/tests/test-client.check-on-disk/test_002-018.expected \
+	clients/tests/test-client.check-on-disk/test_002-019.expected \
+	clients/tests/test-client.check-on-disk/test_002-020.expected \
+	clients/tests/test-client.check-on-disk/test_002-021.expected \
+	clients/tests/test-client.check-on-disk/test_002-022.expected \
+	clients/tests/test-client.check-on-disk/test_002-023.expected \
+	clients/tests/test-client.check-on-disk/test_002-024.expected \
+	clients/tests/test-client.check-on-disk/test_003-001.expected \
+	clients/tests/test-client.check-on-disk/test_003-002.expected \
+	clients/tests/test-client.check-on-disk/test_003-003.expected \
+	clients/tests/test-client.check-on-disk/test_003-004.expected \
+	clients/tests/test-client.check-on-disk/test_003-005.expected \
+	clients/tests/test-client.check-on-disk/test_003-006.expected \
+	clients/tests/test-client.check-on-disk/test_003-007.expected \
+	clients/tests/test-client.check-on-disk/test_003-008.expected \
+	clients/tests/test-client.check-on-disk/test_003-009.expected \
+	clients/tests/test-client.check-on-disk/test_003-010.expected \
+	clients/tests/test-client.check-on-disk/test_003-011.expected \
+	clients/tests/test-client.check-on-disk/test_003-012.expected \
+	clients/tests/test-client.check-on-disk/test_003-013.expected \
+	clients/tests/test-client.check-on-disk/test_003-014.expected \
+	clients/tests/test-client.check-on-disk/test_003-015.expected \
+	clients/tests/test-client.check-on-disk/test_003-016.expected \
+	clients/tests/test-client.check-on-disk/test_003-017.expected \
+	clients/tests/test-client.check-on-disk/test_003-018.expected \
+	clients/tests/test-client.check-on-disk/test_003-019.expected \
+	clients/tests/test-client.check-on-disk/test_003-020.expected \
+	clients/tests/test-client.check-on-disk/test_003-021.expected \
+	clients/tests/test-client.check-on-disk/test_003-022.expected \
+	clients/tests/test-client.check-on-disk/test_003-023.expected \
+	clients/tests/test-client.check-on-disk/test_003-024.expected \
+	clients/tests/test-client.check-on-disk/test_003-025.expected \
+	clients/tests/test-client.check-on-disk/test_003-026.expected \
+	clients/tests/test-client.check-on-disk/test_003-027.expected \
+	clients/tests/test-client.check-on-disk/test_003-028.expected \
+	clients/tests/test-client.check-on-disk/test_003-029.expected \
+	clients/tests/test-client.check-on-disk/test_003-030.expected \
+	clients/tests/test-client.check-on-disk/test_003-031.expected \
+	clients/tests/test-client.check-on-disk/test_003-032.expected \
+	clients/tests/test-client.check-on-disk/test_003-033.expected \
+	clients/tests/test-client.check-on-disk/test_003-034.expected \
+	clients/tests/test-client.check-on-disk/test_003-035.expected \
+	clients/tests/test-client.check-on-disk/test_003-036.expected \
+	clients/tests/test-client.check-on-disk/test_003-037.expected \
+	clients/tests/test-client.check-on-disk/test_003-038.expected \
+	clients/tests/test-client.check-on-disk/test_003-039.expected \
+	clients/tests/test-client.check-on-disk/test_003-040.expected \
+	clients/tests/test-client.check-on-disk/test_003-041.expected \
+	clients/tests/test-client.check-on-disk/test_003-042.expected \
+	clients/tests/test-client.check-on-disk/test_003-043.expected \
+	clients/tests/test-client.check-on-disk/test_003-044.expected \
+	clients/tests/test-client.check-on-disk/test_003-045.expected \
+	clients/tests/test-client.check-on-disk/test_003-046.expected \
+	clients/tests/test-client.check-on-disk/test_003-047.expected \
+	clients/tests/test-client.check-on-disk/test_003-048.expected \
+	clients/tests/test-client.check-on-disk/test_003-049.expected \
+	clients/tests/test-client.check-on-disk/test_003-050.expected \
+	clients/tests/test-client.check-on-disk/test_003-051.expected \
+	clients/tests/test-client.check-on-disk/test_003-052.expected \
+	clients/tests/test-client.check-on-disk/test_003-053.expected \
+	clients/tests/test-client.check-on-disk/test_003-054.expected \
+	clients/tests/test-client.check-on-disk/test_004-001.expected \
+	clients/tests/test-client.check-on-disk/test_004-002.expected \
+	clients/tests/test-client.check-on-disk/test_004-003.expected \
+	clients/tests/test-client.check-on-disk/test_004-004.expected \
+	clients/tests/test-client.check-on-disk/test_004-005.expected \
+	clients/tests/test-client.check-on-disk/test_004-006.expected \
+	$(NULL)
diff --git a/clients/tests/test-client.check-on-disk/test_001-001.expected b/clients/tests/test-client.check-on-disk/test_001-001.expected
new file mode 100644
index 00000000..23f546bf
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-001.expected
@@ -0,0 +1,19 @@
+location: clients/tests/test-client.py:651:test_001()/1
+cmd: $NMCLI 
+lang: C
+returncode: 0
+stdout: 277 bytes
+>>>
+DNS configuration:
+	servers: 1.2.3.4 5.6.7.8
+
+Use "nmcli device show" to get complete information about known devices and
+"nmcli connection show" to get an overview on active connection profiles.
+
+Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage details.
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-002.expected b/clients/tests/test-client.check-on-disk/test_001-002.expected
new file mode 100644
index 00000000..bcbb86ee
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-002.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:651:test_001()/2
+cmd: $NMCLI 
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 310 bytes
+>>>
+DNS configuration:
+	servers: 1.2.3.4 5.6.7.8
+
+Polecenie „nmcli device show” wyświetli pełne informacje o znanych
+urządzeniach, a „nmcli connection show” wyświetli przegląd aktywnych
+profili połączeń.
+
+Strony podręcznika nmcli(1) i nmcli-examples(5) zawierają pełne informacje
+o użyciu.
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-003.expected b/clients/tests/test-client.check-on-disk/test_001-003.expected
new file mode 100644
index 00000000..f08e8df7
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-003.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:653:test_001()/3
+cmd: $NMCLI -f AP -mode multiline -p d show wlan0
+lang: C
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 33 bytes
+>>>
+Error: Device 'wlan0' not found.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-004.expected b/clients/tests/test-client.check-on-disk/test_001-004.expected
new file mode 100644
index 00000000..1e01f6cd
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-004.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:653:test_001()/4
+cmd: $NMCLI -f AP -mode multiline -p d show wlan0
+lang: pl_PL.UTF-8
+returncode: 10
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 49 bytes
+>>>
+Błąd: Nie odnaleziono urządzenia „wlan0”.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-005.expected b/clients/tests/test-client.check-on-disk/test_001-005.expected
new file mode 100644
index 00000000..c3ddbd52
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-005.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:655:test_001()/5
+cmd: $NMCLI c s
+lang: C
+returncode: 0
+stdout: 26 bytes
+>>>
+NAME  UUID  TYPE  DEVICE 
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-006.expected b/clients/tests/test-client.check-on-disk/test_001-006.expected
new file mode 100644
index 00000000..6e1bbca1
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-006.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:655:test_001()/6
+cmd: $NMCLI c s
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 26 bytes
+>>>
+NAME  UUID  TYPE  DEVICE 
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-007.expected b/clients/tests/test-client.check-on-disk/test_001-007.expected
new file mode 100644
index 00000000..759cfe56
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-007.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:657:test_001()/7
+cmd: $NMCLI bogus s
+lang: C
+returncode: 2
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 68 bytes
+>>>
+Error: argument 'bogus' not understood. Try passing --help instead.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-008.expected b/clients/tests/test-client.check-on-disk/test_001-008.expected
new file mode 100644
index 00000000..ba4d941c
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-008.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:657:test_001()/8
+cmd: $NMCLI bogus s
+lang: pl_PL.UTF-8
+returncode: 2
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 87 bytes
+>>>
+Błąd: nie zrozumiano parametru „bogus”. Można użyć „--help” zamiast tego.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-009.expected b/clients/tests/test-client.check-on-disk/test_001-009.expected
new file mode 100644
index 00000000..2614409a
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-009.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:665:test_001()/9
+cmd: $NMCLI general permissions
+lang: C
+returncode: 0
+stdout: 1275 bytes
+>>>
+PERMISSION                                                        VALUE   
+org.freedesktop.NetworkManager.enable-disable-network             yes     
+org.freedesktop.NetworkManager.enable-disable-wifi                yes     
+org.freedesktop.NetworkManager.enable-disable-wwan                yes     
+org.freedesktop.NetworkManager.enable-disable-wimax               yes     
+org.freedesktop.NetworkManager.sleep-wake                         no      
+org.freedesktop.NetworkManager.network-control                    yes     
+org.freedesktop.NetworkManager.wifi.share.protected               yes     
+org.freedesktop.NetworkManager.wifi.share.open                    yes     
+org.freedesktop.NetworkManager.settings.modify.system             yes     
+org.freedesktop.NetworkManager.settings.modify.own                yes     
+org.freedesktop.NetworkManager.settings.modify.hostname           yes     
+org.freedesktop.NetworkManager.settings.modify.global-dns         no      
+org.freedesktop.NetworkManager.reload                             no      
+org.freedesktop.NetworkManager.checkpoint-rollback                unknown 
+org.freedesktop.NetworkManager.enable-disable-statistics          unknown 
+org.freedesktop.NetworkManager.enable-disable-connectivity-check  unknown 
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-010.expected b/clients/tests/test-client.check-on-disk/test_001-010.expected
new file mode 100644
index 00000000..0c9f540f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-010.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:665:test_001()/10
+cmd: $NMCLI general permissions
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1292 bytes
+>>>
+PERMISSION                                                        VALUE    
+org.freedesktop.NetworkManager.enable-disable-network             tak      
+org.freedesktop.NetworkManager.enable-disable-wifi                tak      
+org.freedesktop.NetworkManager.enable-disable-wwan                tak      
+org.freedesktop.NetworkManager.enable-disable-wimax               tak      
+org.freedesktop.NetworkManager.sleep-wake                         nie      
+org.freedesktop.NetworkManager.network-control                    tak      
+org.freedesktop.NetworkManager.wifi.share.protected               tak      
+org.freedesktop.NetworkManager.wifi.share.open                    tak      
+org.freedesktop.NetworkManager.settings.modify.system             tak      
+org.freedesktop.NetworkManager.settings.modify.own                tak      
+org.freedesktop.NetworkManager.settings.modify.hostname           tak      
+org.freedesktop.NetworkManager.settings.modify.global-dns         nie      
+org.freedesktop.NetworkManager.reload                             nie      
+org.freedesktop.NetworkManager.checkpoint-rollback                nieznane 
+org.freedesktop.NetworkManager.enable-disable-statistics          nieznane 
+org.freedesktop.NetworkManager.enable-disable-connectivity-check  nieznane 
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-011.expected b/clients/tests/test-client.check-on-disk/test_001-011.expected
new file mode 100644
index 00000000..fc6cc6b6
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-011.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:665:test_001()/11
+cmd: $NMCLI --pretty general permissions
+lang: C
+returncode: 0
+stdout: 1472 bytes
+>>>
+==============================
+  NetworkManager permissions
+==============================
+PERMISSION                                                        VALUE   
+---------------------------------------------------------------------------------------------------------
+org.freedesktop.NetworkManager.enable-disable-network             yes     
+org.freedesktop.NetworkManager.enable-disable-wifi                yes     
+org.freedesktop.NetworkManager.enable-disable-wwan                yes     
+org.freedesktop.NetworkManager.enable-disable-wimax               yes     
+org.freedesktop.NetworkManager.sleep-wake                         no      
+org.freedesktop.NetworkManager.network-control                    yes     
+org.freedesktop.NetworkManager.wifi.share.protected               yes     
+org.freedesktop.NetworkManager.wifi.share.open                    yes     
+org.freedesktop.NetworkManager.settings.modify.system             yes     
+org.freedesktop.NetworkManager.settings.modify.own                yes     
+org.freedesktop.NetworkManager.settings.modify.hostname           yes     
+org.freedesktop.NetworkManager.settings.modify.global-dns         no      
+org.freedesktop.NetworkManager.reload                             no      
+org.freedesktop.NetworkManager.checkpoint-rollback                unknown 
+org.freedesktop.NetworkManager.enable-disable-statistics          unknown 
+org.freedesktop.NetworkManager.enable-disable-connectivity-check  unknown 
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-012.expected b/clients/tests/test-client.check-on-disk/test_001-012.expected
new file mode 100644
index 00000000..cb1793d2
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-012.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:665:test_001()/12
+cmd: $NMCLI --pretty general permissions
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1519 bytes
+>>>
+=====================================
+  Uprawnienia usługi NetworkManager
+=====================================
+PERMISSION                                                        VALUE    
+-----------------------------------------------------------------------------------------------------------------
+org.freedesktop.NetworkManager.enable-disable-network             tak      
+org.freedesktop.NetworkManager.enable-disable-wifi                tak      
+org.freedesktop.NetworkManager.enable-disable-wwan                tak      
+org.freedesktop.NetworkManager.enable-disable-wimax               tak      
+org.freedesktop.NetworkManager.sleep-wake                         nie      
+org.freedesktop.NetworkManager.network-control                    tak      
+org.freedesktop.NetworkManager.wifi.share.protected               tak      
+org.freedesktop.NetworkManager.wifi.share.open                    tak      
+org.freedesktop.NetworkManager.settings.modify.system             tak      
+org.freedesktop.NetworkManager.settings.modify.own                tak      
+org.freedesktop.NetworkManager.settings.modify.hostname           tak      
+org.freedesktop.NetworkManager.settings.modify.global-dns         nie      
+org.freedesktop.NetworkManager.reload                             nie      
+org.freedesktop.NetworkManager.checkpoint-rollback                nieznane 
+org.freedesktop.NetworkManager.enable-disable-statistics          nieznane 
+org.freedesktop.NetworkManager.enable-disable-connectivity-check  nieznane 
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-013.expected b/clients/tests/test-client.check-on-disk/test_001-013.expected
new file mode 100644
index 00000000..1317ee13
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-013.expected
@@ -0,0 +1,28 @@
+location: clients/tests/test-client.py:665:test_001()/13
+cmd: $NMCLI --terse general permissions
+lang: C
+returncode: 0
+stdout: 899 bytes
+>>>
+org.freedesktop.NetworkManager.enable-disable-network:yes
+org.freedesktop.NetworkManager.enable-disable-wifi:yes
+org.freedesktop.NetworkManager.enable-disable-wwan:yes
+org.freedesktop.NetworkManager.enable-disable-wimax:yes
+org.freedesktop.NetworkManager.sleep-wake:no
+org.freedesktop.NetworkManager.network-control:yes
+org.freedesktop.NetworkManager.wifi.share.protected:yes
+org.freedesktop.NetworkManager.wifi.share.open:yes
+org.freedesktop.NetworkManager.settings.modify.system:yes
+org.freedesktop.NetworkManager.settings.modify.own:yes
+org.freedesktop.NetworkManager.settings.modify.hostname:yes
+org.freedesktop.NetworkManager.settings.modify.global-dns:no
+org.freedesktop.NetworkManager.reload:no
+org.freedesktop.NetworkManager.checkpoint-rollback:unknown
+org.freedesktop.NetworkManager.enable-disable-statistics:unknown
+org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-014.expected b/clients/tests/test-client.check-on-disk/test_001-014.expected
new file mode 100644
index 00000000..73e62b7e
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-014.expected
@@ -0,0 +1,28 @@
+location: clients/tests/test-client.py:665:test_001()/14
+cmd: $NMCLI --terse general permissions
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 899 bytes
+>>>
+org.freedesktop.NetworkManager.enable-disable-network:yes
+org.freedesktop.NetworkManager.enable-disable-wifi:yes
+org.freedesktop.NetworkManager.enable-disable-wwan:yes
+org.freedesktop.NetworkManager.enable-disable-wimax:yes
+org.freedesktop.NetworkManager.sleep-wake:no
+org.freedesktop.NetworkManager.network-control:yes
+org.freedesktop.NetworkManager.wifi.share.protected:yes
+org.freedesktop.NetworkManager.wifi.share.open:yes
+org.freedesktop.NetworkManager.settings.modify.system:yes
+org.freedesktop.NetworkManager.settings.modify.own:yes
+org.freedesktop.NetworkManager.settings.modify.hostname:yes
+org.freedesktop.NetworkManager.settings.modify.global-dns:no
+org.freedesktop.NetworkManager.reload:no
+org.freedesktop.NetworkManager.checkpoint-rollback:unknown
+org.freedesktop.NetworkManager.enable-disable-statistics:unknown
+org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-015.expected b/clients/tests/test-client.check-on-disk/test_001-015.expected
new file mode 100644
index 00000000..426d9834
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-015.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:665:test_001()/15
+cmd: $NMCLI --mode tabular general permissions
+lang: C
+returncode: 0
+stdout: 1275 bytes
+>>>
+PERMISSION                                                        VALUE   
+org.freedesktop.NetworkManager.enable-disable-network             yes     
+org.freedesktop.NetworkManager.enable-disable-wifi                yes     
+org.freedesktop.NetworkManager.enable-disable-wwan                yes     
+org.freedesktop.NetworkManager.enable-disable-wimax               yes     
+org.freedesktop.NetworkManager.sleep-wake                         no      
+org.freedesktop.NetworkManager.network-control                    yes     
+org.freedesktop.NetworkManager.wifi.share.protected               yes     
+org.freedesktop.NetworkManager.wifi.share.open                    yes     
+org.freedesktop.NetworkManager.settings.modify.system             yes     
+org.freedesktop.NetworkManager.settings.modify.own                yes     
+org.freedesktop.NetworkManager.settings.modify.hostname           yes     
+org.freedesktop.NetworkManager.settings.modify.global-dns         no      
+org.freedesktop.NetworkManager.reload                             no      
+org.freedesktop.NetworkManager.checkpoint-rollback                unknown 
+org.freedesktop.NetworkManager.enable-disable-statistics          unknown 
+org.freedesktop.NetworkManager.enable-disable-connectivity-check  unknown 
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-016.expected b/clients/tests/test-client.check-on-disk/test_001-016.expected
new file mode 100644
index 00000000..e501a8d3
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-016.expected
@@ -0,0 +1,29 @@
+location: clients/tests/test-client.py:665:test_001()/16
+cmd: $NMCLI --mode tabular general permissions
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1292 bytes
+>>>
+PERMISSION                                                        VALUE    
+org.freedesktop.NetworkManager.enable-disable-network             tak      
+org.freedesktop.NetworkManager.enable-disable-wifi                tak      
+org.freedesktop.NetworkManager.enable-disable-wwan                tak      
+org.freedesktop.NetworkManager.enable-disable-wimax               tak      
+org.freedesktop.NetworkManager.sleep-wake                         nie      
+org.freedesktop.NetworkManager.network-control                    tak      
+org.freedesktop.NetworkManager.wifi.share.protected               tak      
+org.freedesktop.NetworkManager.wifi.share.open                    tak      
+org.freedesktop.NetworkManager.settings.modify.system             tak      
+org.freedesktop.NetworkManager.settings.modify.own                tak      
+org.freedesktop.NetworkManager.settings.modify.hostname           tak      
+org.freedesktop.NetworkManager.settings.modify.global-dns         nie      
+org.freedesktop.NetworkManager.reload                             nie      
+org.freedesktop.NetworkManager.checkpoint-rollback                nieznane 
+org.freedesktop.NetworkManager.enable-disable-statistics          nieznane 
+org.freedesktop.NetworkManager.enable-disable-connectivity-check  nieznane 
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-017.expected b/clients/tests/test-client.check-on-disk/test_001-017.expected
new file mode 100644
index 00000000..ab38df97
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-017.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:665:test_001()/17
+cmd: $NMCLI --mode tabular --pretty general permissions
+lang: C
+returncode: 0
+stdout: 1472 bytes
+>>>
+==============================
+  NetworkManager permissions
+==============================
+PERMISSION                                                        VALUE   
+---------------------------------------------------------------------------------------------------------
+org.freedesktop.NetworkManager.enable-disable-network             yes     
+org.freedesktop.NetworkManager.enable-disable-wifi                yes     
+org.freedesktop.NetworkManager.enable-disable-wwan                yes     
+org.freedesktop.NetworkManager.enable-disable-wimax               yes     
+org.freedesktop.NetworkManager.sleep-wake                         no      
+org.freedesktop.NetworkManager.network-control                    yes     
+org.freedesktop.NetworkManager.wifi.share.protected               yes     
+org.freedesktop.NetworkManager.wifi.share.open                    yes     
+org.freedesktop.NetworkManager.settings.modify.system             yes     
+org.freedesktop.NetworkManager.settings.modify.own                yes     
+org.freedesktop.NetworkManager.settings.modify.hostname           yes     
+org.freedesktop.NetworkManager.settings.modify.global-dns         no      
+org.freedesktop.NetworkManager.reload                             no      
+org.freedesktop.NetworkManager.checkpoint-rollback                unknown 
+org.freedesktop.NetworkManager.enable-disable-statistics          unknown 
+org.freedesktop.NetworkManager.enable-disable-connectivity-check  unknown 
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-018.expected b/clients/tests/test-client.check-on-disk/test_001-018.expected
new file mode 100644
index 00000000..7bbf78f5
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-018.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:665:test_001()/18
+cmd: $NMCLI --mode tabular --pretty general permissions
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1519 bytes
+>>>
+=====================================
+  Uprawnienia usługi NetworkManager
+=====================================
+PERMISSION                                                        VALUE    
+-----------------------------------------------------------------------------------------------------------------
+org.freedesktop.NetworkManager.enable-disable-network             tak      
+org.freedesktop.NetworkManager.enable-disable-wifi                tak      
+org.freedesktop.NetworkManager.enable-disable-wwan                tak      
+org.freedesktop.NetworkManager.enable-disable-wimax               tak      
+org.freedesktop.NetworkManager.sleep-wake                         nie      
+org.freedesktop.NetworkManager.network-control                    tak      
+org.freedesktop.NetworkManager.wifi.share.protected               tak      
+org.freedesktop.NetworkManager.wifi.share.open                    tak      
+org.freedesktop.NetworkManager.settings.modify.system             tak      
+org.freedesktop.NetworkManager.settings.modify.own                tak      
+org.freedesktop.NetworkManager.settings.modify.hostname           tak      
+org.freedesktop.NetworkManager.settings.modify.global-dns         nie      
+org.freedesktop.NetworkManager.reload                             nie      
+org.freedesktop.NetworkManager.checkpoint-rollback                nieznane 
+org.freedesktop.NetworkManager.enable-disable-statistics          nieznane 
+org.freedesktop.NetworkManager.enable-disable-connectivity-check  nieznane 
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-019.expected b/clients/tests/test-client.check-on-disk/test_001-019.expected
new file mode 100644
index 00000000..23692b05
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-019.expected
@@ -0,0 +1,28 @@
+location: clients/tests/test-client.py:665:test_001()/19
+cmd: $NMCLI --mode tabular --terse general permissions
+lang: C
+returncode: 0
+stdout: 899 bytes
+>>>
+org.freedesktop.NetworkManager.enable-disable-network:yes
+org.freedesktop.NetworkManager.enable-disable-wifi:yes
+org.freedesktop.NetworkManager.enable-disable-wwan:yes
+org.freedesktop.NetworkManager.enable-disable-wimax:yes
+org.freedesktop.NetworkManager.sleep-wake:no
+org.freedesktop.NetworkManager.network-control:yes
+org.freedesktop.NetworkManager.wifi.share.protected:yes
+org.freedesktop.NetworkManager.wifi.share.open:yes
+org.freedesktop.NetworkManager.settings.modify.system:yes
+org.freedesktop.NetworkManager.settings.modify.own:yes
+org.freedesktop.NetworkManager.settings.modify.hostname:yes
+org.freedesktop.NetworkManager.settings.modify.global-dns:no
+org.freedesktop.NetworkManager.reload:no
+org.freedesktop.NetworkManager.checkpoint-rollback:unknown
+org.freedesktop.NetworkManager.enable-disable-statistics:unknown
+org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-020.expected b/clients/tests/test-client.check-on-disk/test_001-020.expected
new file mode 100644
index 00000000..b0987d67
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-020.expected
@@ -0,0 +1,28 @@
+location: clients/tests/test-client.py:665:test_001()/20
+cmd: $NMCLI --mode tabular --terse general permissions
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 899 bytes
+>>>
+org.freedesktop.NetworkManager.enable-disable-network:yes
+org.freedesktop.NetworkManager.enable-disable-wifi:yes
+org.freedesktop.NetworkManager.enable-disable-wwan:yes
+org.freedesktop.NetworkManager.enable-disable-wimax:yes
+org.freedesktop.NetworkManager.sleep-wake:no
+org.freedesktop.NetworkManager.network-control:yes
+org.freedesktop.NetworkManager.wifi.share.protected:yes
+org.freedesktop.NetworkManager.wifi.share.open:yes
+org.freedesktop.NetworkManager.settings.modify.system:yes
+org.freedesktop.NetworkManager.settings.modify.own:yes
+org.freedesktop.NetworkManager.settings.modify.hostname:yes
+org.freedesktop.NetworkManager.settings.modify.global-dns:no
+org.freedesktop.NetworkManager.reload:no
+org.freedesktop.NetworkManager.checkpoint-rollback:unknown
+org.freedesktop.NetworkManager.enable-disable-statistics:unknown
+org.freedesktop.NetworkManager.enable-disable-connectivity-check:unknown
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-021.expected b/clients/tests/test-client.check-on-disk/test_001-021.expected
new file mode 100644
index 00000000..eb082c02
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-021.expected
@@ -0,0 +1,44 @@
+location: clients/tests/test-client.py:665:test_001()/21
+cmd: $NMCLI --mode multiline general permissions
+lang: C
+returncode: 0
+stdout: 2179 bytes
+>>>
+PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-network
+VALUE:                                  yes
+PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-wifi
+VALUE:                                  yes
+PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-wwan
+VALUE:                                  yes
+PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-wimax
+VALUE:                                  yes
+PERMISSION:                             org.freedesktop.NetworkManager.sleep-wake
+VALUE:                                  no
+PERMISSION:                             org.freedesktop.NetworkManager.network-control
+VALUE:                                  yes
+PERMISSION:                             org.freedesktop.NetworkManager.wifi.share.protected
+VALUE:                                  yes
+PERMISSION:                             org.freedesktop.NetworkManager.wifi.share.open
+VALUE:                                  yes
+PERMISSION:                             org.freedesktop.NetworkManager.settings.modify.system
+VALUE:                                  yes
+PERMISSION:                             org.freedesktop.NetworkManager.settings.modify.own
+VALUE:                                  yes
+PERMISSION:                             org.freedesktop.NetworkManager.settings.modify.hostname
+VALUE:                                  yes
+PERMISSION:                             org.freedesktop.NetworkManager.settings.modify.global-dns
+VALUE:                                  no
+PERMISSION:                             org.freedesktop.NetworkManager.reload
+VALUE:                                  no
+PERMISSION:                             org.freedesktop.NetworkManager.checkpoint-rollback
+VALUE:                                  unknown
+PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-statistics
+VALUE:                                  unknown
+PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-connectivity-check
+VALUE:                                  unknown
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-022.expected b/clients/tests/test-client.check-on-disk/test_001-022.expected
new file mode 100644
index 00000000..df002053
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-022.expected
@@ -0,0 +1,44 @@
+location: clients/tests/test-client.py:665:test_001()/22
+cmd: $NMCLI --mode multiline general permissions
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 2185 bytes
+>>>
+PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-network
+VALUE:                                  tak
+PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-wifi
+VALUE:                                  tak
+PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-wwan
+VALUE:                                  tak
+PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-wimax
+VALUE:                                  tak
+PERMISSION:                             org.freedesktop.NetworkManager.sleep-wake
+VALUE:                                  nie
+PERMISSION:                             org.freedesktop.NetworkManager.network-control
+VALUE:                                  tak
+PERMISSION:                             org.freedesktop.NetworkManager.wifi.share.protected
+VALUE:                                  tak
+PERMISSION:                             org.freedesktop.NetworkManager.wifi.share.open
+VALUE:                                  tak
+PERMISSION:                             org.freedesktop.NetworkManager.settings.modify.system
+VALUE:                                  tak
+PERMISSION:                             org.freedesktop.NetworkManager.settings.modify.own
+VALUE:                                  tak
+PERMISSION:                             org.freedesktop.NetworkManager.settings.modify.hostname
+VALUE:                                  tak
+PERMISSION:                             org.freedesktop.NetworkManager.settings.modify.global-dns
+VALUE:                                  nie
+PERMISSION:                             org.freedesktop.NetworkManager.reload
+VALUE:                                  nie
+PERMISSION:                             org.freedesktop.NetworkManager.checkpoint-rollback
+VALUE:                                  nieznane
+PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-statistics
+VALUE:                                  nieznane
+PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-connectivity-check
+VALUE:                                  nieznane
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-023.expected b/clients/tests/test-client.check-on-disk/test_001-023.expected
new file mode 100644
index 00000000..55376eb9
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-023.expected
@@ -0,0 +1,63 @@
+location: clients/tests/test-client.py:665:test_001()/23
+cmd: $NMCLI --mode multiline --pretty general permissions
+lang: C
+returncode: 0
+stdout: 3672 bytes
+>>>
+===============================================================================
+                          NetworkManager permissions
+===============================================================================
+PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-network
+VALUE:                                  yes
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-wifi
+VALUE:                                  yes
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-wwan
+VALUE:                                  yes
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-wimax
+VALUE:                                  yes
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.sleep-wake
+VALUE:                                  no
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.network-control
+VALUE:                                  yes
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.wifi.share.protected
+VALUE:                                  yes
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.wifi.share.open
+VALUE:                                  yes
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.settings.modify.system
+VALUE:                                  yes
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.settings.modify.own
+VALUE:                                  yes
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.settings.modify.hostname
+VALUE:                                  yes
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.settings.modify.global-dns
+VALUE:                                  no
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.reload
+VALUE:                                  no
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.checkpoint-rollback
+VALUE:                                  unknown
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-statistics
+VALUE:                                  unknown
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-connectivity-check
+VALUE:                                  unknown
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-024.expected b/clients/tests/test-client.check-on-disk/test_001-024.expected
new file mode 100644
index 00000000..10b3b04c
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-024.expected
@@ -0,0 +1,63 @@
+location: clients/tests/test-client.py:665:test_001()/24
+cmd: $NMCLI --mode multiline --pretty general permissions
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 3683 bytes
+>>>
+===============================================================================
+                       Uprawnienia usługi NetworkManager
+===============================================================================
+PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-network
+VALUE:                                  tak
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-wifi
+VALUE:                                  tak
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-wwan
+VALUE:                                  tak
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-wimax
+VALUE:                                  tak
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.sleep-wake
+VALUE:                                  nie
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.network-control
+VALUE:                                  tak
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.wifi.share.protected
+VALUE:                                  tak
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.wifi.share.open
+VALUE:                                  tak
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.settings.modify.system
+VALUE:                                  tak
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.settings.modify.own
+VALUE:                                  tak
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.settings.modify.hostname
+VALUE:                                  tak
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.settings.modify.global-dns
+VALUE:                                  nie
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.reload
+VALUE:                                  nie
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.checkpoint-rollback
+VALUE:                                  nieznane
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-statistics
+VALUE:                                  nieznane
+-------------------------------------------------------------------------------
+PERMISSION:                             org.freedesktop.NetworkManager.enable-disable-connectivity-check
+VALUE:                                  nieznane
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-025.expected b/clients/tests/test-client.check-on-disk/test_001-025.expected
new file mode 100644
index 00000000..687e62bf
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-025.expected
@@ -0,0 +1,44 @@
+location: clients/tests/test-client.py:665:test_001()/25
+cmd: $NMCLI --mode multiline --terse general permissions
+lang: C
+returncode: 0
+stdout: 1171 bytes
+>>>
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-network
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-wifi
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-wwan
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-wimax
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.sleep-wake
+VALUE:no
+PERMISSION:org.freedesktop.NetworkManager.network-control
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.wifi.share.protected
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.wifi.share.open
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.settings.modify.system
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.settings.modify.own
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.settings.modify.hostname
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.settings.modify.global-dns
+VALUE:no
+PERMISSION:org.freedesktop.NetworkManager.reload
+VALUE:no
+PERMISSION:org.freedesktop.NetworkManager.checkpoint-rollback
+VALUE:unknown
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics
+VALUE:unknown
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check
+VALUE:unknown
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_001-026.expected b/clients/tests/test-client.check-on-disk/test_001-026.expected
new file mode 100644
index 00000000..1b01d876
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_001-026.expected
@@ -0,0 +1,44 @@
+location: clients/tests/test-client.py:665:test_001()/26
+cmd: $NMCLI --mode multiline --terse general permissions
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1171 bytes
+>>>
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-network
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-wifi
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-wwan
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-wimax
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.sleep-wake
+VALUE:no
+PERMISSION:org.freedesktop.NetworkManager.network-control
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.wifi.share.protected
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.wifi.share.open
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.settings.modify.system
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.settings.modify.own
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.settings.modify.hostname
+VALUE:yes
+PERMISSION:org.freedesktop.NetworkManager.settings.modify.global-dns
+VALUE:no
+PERMISSION:org.freedesktop.NetworkManager.reload
+VALUE:no
+PERMISSION:org.freedesktop.NetworkManager.checkpoint-rollback
+VALUE:unknown
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-statistics
+VALUE:unknown
+PERMISSION:org.freedesktop.NetworkManager.enable-disable-connectivity-check
+VALUE:unknown
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_002-001.expected b/clients/tests/test-client.check-on-disk/test_002-001.expected
new file mode 100644
index 00000000..5f3d7d6a
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_002-001.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:670:test_002()/1
+cmd: $NMCLI d
+lang: C
+returncode: 0
+stdout: 258 bytes
+>>>
+DEVICE  TYPE      STATE        CONNECTION 
+eth0    ethernet  unavailable  --         
+eth1    ethernet  unavailable  --         
+wlan0   wifi      unavailable  --         
+wlan1   wifi      unavailable  --         
+wlan1   wifi      unavailable  --         
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_002-002.expected b/clients/tests/test-client.check-on-disk/test_002-002.expected
new file mode 100644
index 00000000..3bdc45e4
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_002-002.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:670:test_002()/2
+cmd: $NMCLI d
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 263 bytes
+>>>
+DEVICE  TYPE      STATE        CONNECTION 
+eth0    ethernet  niedostępne  --         
+eth1    ethernet  niedostępne  --         
+wlan0   wifi      niedostępne  --         
+wlan1   wifi      niedostępne  --         
+wlan1   wifi      niedostępne  --         
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_002-003.expected b/clients/tests/test-client.check-on-disk/test_002-003.expected
new file mode 100644
index 00000000..e2e56101
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_002-003.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:672:test_002()/3
+cmd: $NMCLI -f all d
+lang: C
+returncode: 0
+stdout: 636 bytes
+>>>
+DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID  CON-PATH 
+eth0    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/1  --          --        --       
+eth1    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/2  --          --        --       
+wlan0   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/3  --          --        --       
+wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/4  --          --        --       
+wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/5  --          --        --       
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_002-004.expected b/clients/tests/test-client.check-on-disk/test_002-004.expected
new file mode 100644
index 00000000..0e884ed0
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_002-004.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:672:test_002()/4
+cmd: $NMCLI -f all d
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 641 bytes
+>>>
+DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID  CON-PATH 
+eth0    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/1  --          --        --       
+eth1    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/2  --          --        --       
+wlan0   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/3  --          --        --       
+wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/4  --          --        --       
+wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/5  --          --        --       
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_002-005.expected b/clients/tests/test-client.check-on-disk/test_002-005.expected
new file mode 100644
index 00000000..3d1440ea
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_002-005.expected
@@ -0,0 +1,39 @@
+location: clients/tests/test-client.py:674:test_002()/5
+cmd: $NMCLI 
+lang: C
+returncode: 0
+stdout: 621 bytes
+>>>
+eth0: unavailable
+	"eth0"
+	ethernet (virtual), 72:41:AB:90:41:5D, hw
+
+eth1: unavailable
+	"eth1"
+	ethernet (virtual), 1F:E6:D1:E6:1D:53, hw
+
+wlan0: unavailable
+	"wlan0"
+	wifi (virtual), 5A:88:5E:B6:90:40, hw
+
+wlan1: unavailable
+	"wlan1"
+	wifi (virtual), 7C:D4:69:31:67:0B, hw
+
+wlan1: unavailable
+	"wlan1"
+	wifi (virtual), 41:21:6B:F3:C9:4A, hw
+
+DNS configuration:
+	servers: 1.2.3.4 5.6.7.8
+
+Use "nmcli device show" to get complete information about known devices and
+"nmcli connection show" to get an overview on active connection profiles.
+
+Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage details.
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_002-006.expected b/clients/tests/test-client.check-on-disk/test_002-006.expected
new file mode 100644
index 00000000..a676f62d
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_002-006.expected
@@ -0,0 +1,41 @@
+location: clients/tests/test-client.py:674:test_002()/6
+cmd: $NMCLI 
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 684 bytes
+>>>
+eth0: niedostępne
+	"eth0"
+	ethernet (virtual), 72:41:AB:90:41:5D, sprzęt
+
+eth1: niedostępne
+	"eth1"
+	ethernet (virtual), 1F:E6:D1:E6:1D:53, sprzęt
+
+wlan0: niedostępne
+	"wlan0"
+	wifi (virtual), 5A:88:5E:B6:90:40, sprzęt
+
+wlan1: niedostępne
+	"wlan1"
+	wifi (virtual), 7C:D4:69:31:67:0B, sprzęt
+
+wlan1: niedostępne
+	"wlan1"
+	wifi (virtual), 41:21:6B:F3:C9:4A, sprzęt
+
+DNS configuration:
+	servers: 1.2.3.4 5.6.7.8
+
+Polecenie „nmcli device show” wyświetli pełne informacje o znanych
+urządzeniach, a „nmcli connection show” wyświetli przegląd aktywnych
+profili połączeń.
+
+Strony podręcznika nmcli(1) i nmcli-examples(5) zawierają pełne informacje
+o użyciu.
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_002-007.expected b/clients/tests/test-client.check-on-disk/test_002-007.expected
new file mode 100644
index 00000000..780e7f6e
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_002-007.expected
@@ -0,0 +1,36 @@
+location: clients/tests/test-client.py:676:test_002()/7
+cmd: $NMCLI -f AP -mode multiline d show wlan0
+lang: C
+returncode: 0
+stdout: 1107 bytes
+>>>
+AP[1].IN-USE:                            
+AP[1].SSID:                             wlan0-ap-3
+AP[1].MODE:                             Infra
+AP[1].CHAN:                             1
+AP[1].RATE:                             54 Mbit/s
+AP[1].SIGNAL:                           88
+AP[1].BARS:                             ****
+AP[1].SECURITY:                         WPA1 WPA2
+AP[2].IN-USE:                            
+AP[2].SSID:                             wlan0-ap-2
+AP[2].MODE:                             Infra
+AP[2].CHAN:                             1
+AP[2].RATE:                             54 Mbit/s
+AP[2].SIGNAL:                           61
+AP[2].BARS:                             *** 
+AP[2].SECURITY:                         WPA1 WPA2
+AP[3].IN-USE:                            
+AP[3].SSID:                             wlan0-ap-1
+AP[3].MODE:                             Infra
+AP[3].CHAN:                             1
+AP[3].RATE:                             54 Mbit/s
+AP[3].SIGNAL:                           29
+AP[3].BARS:                             *   
+AP[3].SECURITY:                         WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_002-008.expected b/clients/tests/test-client.check-on-disk/test_002-008.expected
new file mode 100644
index 00000000..c605e8e7
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_002-008.expected
@@ -0,0 +1,36 @@
+location: clients/tests/test-client.py:676:test_002()/8
+cmd: $NMCLI -f AP -mode multiline d show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1134 bytes
+>>>
+AP[1].IN-USE:                            
+AP[1].SSID:                             wlan0-ap-3
+AP[1].MODE:                             Infrastruktura
+AP[1].CHAN:                             1
+AP[1].RATE:                             54 Mb/s
+AP[1].SIGNAL:                           88
+AP[1].BARS:                             ****
+AP[1].SECURITY:                         WPA1 WPA2
+AP[2].IN-USE:                            
+AP[2].SSID:                             wlan0-ap-2
+AP[2].MODE:                             Infrastruktura
+AP[2].CHAN:                             1
+AP[2].RATE:                             54 Mb/s
+AP[2].SIGNAL:                           61
+AP[2].BARS:                             *** 
+AP[2].SECURITY:                         WPA1 WPA2
+AP[3].IN-USE:                            
+AP[3].SSID:                             wlan0-ap-1
+AP[3].MODE:                             Infrastruktura
+AP[3].CHAN:                             1
+AP[3].RATE:                             54 Mb/s
+AP[3].SIGNAL:                           29
+AP[3].BARS:                             *   
+AP[3].SECURITY:                         WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_002-009.expected b/clients/tests/test-client.check-on-disk/test_002-009.expected
new file mode 100644
index 00000000..bd1bbe90
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_002-009.expected
@@ -0,0 +1,42 @@
+location: clients/tests/test-client.py:677:test_002()/9
+cmd: $NMCLI -f AP -mode multiline -p d show wlan0
+lang: C
+returncode: 0
+stdout: 1558 bytes
+>>>
+===============================================================================
+                            Device details (wlan0)
+===============================================================================
+AP[1].IN-USE:                            
+AP[1].SSID:                             wlan0-ap-3
+AP[1].MODE:                             Infra
+AP[1].CHAN:                             1
+AP[1].RATE:                             54 Mbit/s
+AP[1].SIGNAL:                           88
+AP[1].BARS:                             ****
+AP[1].SECURITY:                         WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[2].IN-USE:                            
+AP[2].SSID:                             wlan0-ap-2
+AP[2].MODE:                             Infra
+AP[2].CHAN:                             1
+AP[2].RATE:                             54 Mbit/s
+AP[2].SIGNAL:                           61
+AP[2].BARS:                             *** 
+AP[2].SECURITY:                         WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[3].IN-USE:                            
+AP[3].SSID:                             wlan0-ap-1
+AP[3].MODE:                             Infra
+AP[3].CHAN:                             1
+AP[3].RATE:                             54 Mbit/s
+AP[3].SIGNAL:                           29
+AP[3].BARS:                             *   
+AP[3].SECURITY:                         WPA1 WPA2
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_002-010.expected b/clients/tests/test-client.check-on-disk/test_002-010.expected
new file mode 100644
index 00000000..d3c06c7b
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_002-010.expected
@@ -0,0 +1,42 @@
+location: clients/tests/test-client.py:677:test_002()/10
+cmd: $NMCLI -f AP -mode multiline -p d show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1592 bytes
+>>>
+===============================================================================
+                        Informacje o urządzeniu (wlan0)
+===============================================================================
+AP[1].IN-USE:                            
+AP[1].SSID:                             wlan0-ap-3
+AP[1].MODE:                             Infrastruktura
+AP[1].CHAN:                             1
+AP[1].RATE:                             54 Mb/s
+AP[1].SIGNAL:                           88
+AP[1].BARS:                             ****
+AP[1].SECURITY:                         WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[2].IN-USE:                            
+AP[2].SSID:                             wlan0-ap-2
+AP[2].MODE:                             Infrastruktura
+AP[2].CHAN:                             1
+AP[2].RATE:                             54 Mb/s
+AP[2].SIGNAL:                           61
+AP[2].BARS:                             *** 
+AP[2].SECURITY:                         WPA1 WPA2
+-------------------------------------------------------------------------------
+AP[3].IN-USE:                            
+AP[3].SSID:                             wlan0-ap-1
+AP[3].MODE:                             Infrastruktura
+AP[3].CHAN:                             1
+AP[3].RATE:                             54 Mb/s
+AP[3].SIGNAL:                           29
+AP[3].BARS:                             *   
+AP[3].SECURITY:                         WPA1 WPA2
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_002-011.expected b/clients/tests/test-client.check-on-disk/test_002-011.expected
new file mode 100644
index 00000000..e943c114
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_002-011.expected
@@ -0,0 +1,36 @@
+location: clients/tests/test-client.py:678:test_002()/11
+cmd: $NMCLI -f AP -mode multiline -t d show wlan0
+lang: C
+returncode: 0
+stdout: 435 bytes
+>>>
+AP[1].IN-USE: 
+AP[1].SSID:wlan0-ap-3
+AP[1].MODE:Infra
+AP[1].CHAN:1
+AP[1].RATE:54 Mbit/s
+AP[1].SIGNAL:88
+AP[1].BARS:****
+AP[1].SECURITY:WPA1 WPA2
+AP[2].IN-USE: 
+AP[2].SSID:wlan0-ap-2
+AP[2].MODE:Infra
+AP[2].CHAN:1
+AP[2].RATE:54 Mbit/s
+AP[2].SIGNAL:61
+AP[2].BARS:*** 
+AP[2].SECURITY:WPA1 WPA2
+AP[3].IN-USE: 
+AP[3].SSID:wlan0-ap-1
+AP[3].MODE:Infra
+AP[3].CHAN:1
+AP[3].RATE:54 Mbit/s
+AP[3].SIGNAL:29
+AP[3].BARS:*   
+AP[3].SECURITY:WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_002-012.expected b/clients/tests/test-client.check-on-disk/test_002-012.expected
new file mode 100644
index 00000000..6e3e5d56
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_002-012.expected
@@ -0,0 +1,36 @@
+location: clients/tests/test-client.py:678:test_002()/12
+cmd: $NMCLI -f AP -mode multiline -t d show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 462 bytes
+>>>
+AP[1].IN-USE: 
+AP[1].SSID:wlan0-ap-3
+AP[1].MODE:Infrastruktura
+AP[1].CHAN:1
+AP[1].RATE:54 Mb/s
+AP[1].SIGNAL:88
+AP[1].BARS:****
+AP[1].SECURITY:WPA1 WPA2
+AP[2].IN-USE: 
+AP[2].SSID:wlan0-ap-2
+AP[2].MODE:Infrastruktura
+AP[2].CHAN:1
+AP[2].RATE:54 Mb/s
+AP[2].SIGNAL:61
+AP[2].BARS:*** 
+AP[2].SECURITY:WPA1 WPA2
+AP[3].IN-USE: 
+AP[3].SSID:wlan0-ap-1
+AP[3].MODE:Infrastruktura
+AP[3].CHAN:1
+AP[3].RATE:54 Mb/s
+AP[3].SIGNAL:29
+AP[3].BARS:*   
+AP[3].SECURITY:WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_002-013.expected b/clients/tests/test-client.check-on-disk/test_002-013.expected
new file mode 100644
index 00000000..a649addd
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_002-013.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:679:test_002()/13
+cmd: $NMCLI -f AP -mode tabular d show wlan0
+lang: C
+returncode: 0
+stdout: 304 bytes
+>>>
+NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+AP[1]          wlan0-ap-3  Infra  1     54 Mbit/s  88      ****  WPA1 WPA2 
+AP[2]          wlan0-ap-2  Infra  1     54 Mbit/s  61      ***   WPA1 WPA2 
+AP[3]          wlan0-ap-1  Infra  1     54 Mbit/s  29      *     WPA1 WPA2 
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_002-014.expected b/clients/tests/test-client.check-on-disk/test_002-014.expected
new file mode 100644
index 00000000..d2a8a667
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_002-014.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:679:test_002()/14
+cmd: $NMCLI -f AP -mode tabular d show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 338 bytes
+>>>
+NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+AP[1]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  88      ****  WPA1 WPA2 
+AP[2]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  61      ***   WPA1 WPA2 
+AP[3]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  29      *     WPA1 WPA2 
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_002-015.expected b/clients/tests/test-client.check-on-disk/test_002-015.expected
new file mode 100644
index 00000000..1b28741f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_002-015.expected
@@ -0,0 +1,20 @@
+location: clients/tests/test-client.py:680:test_002()/15
+cmd: $NMCLI -f AP -mode tabular -p d show wlan0
+lang: C
+returncode: 0
+stdout: 460 bytes
+>>>
+==========================
+  Device details (wlan0)
+==========================
+NAME   IN-USE  SSID        MODE   CHAN  RATE       SIGNAL  BARS  SECURITY  
+----------------------------------------------------------------------------
+AP[1]          wlan0-ap-3  Infra  1     54 Mbit/s  88      ****  WPA1 WPA2 
+AP[2]          wlan0-ap-2  Infra  1     54 Mbit/s  61      ***   WPA1 WPA2 
+AP[3]          wlan0-ap-1  Infra  1     54 Mbit/s  29      *     WPA1 WPA2 
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_002-016.expected b/clients/tests/test-client.check-on-disk/test_002-016.expected
new file mode 100644
index 00000000..a5970447
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_002-016.expected
@@ -0,0 +1,20 @@
+location: clients/tests/test-client.py:680:test_002()/16
+cmd: $NMCLI -f AP -mode tabular -p d show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 530 bytes
+>>>
+===================================
+  Informacje o urządzeniu (wlan0)
+===================================
+NAME   IN-USE  SSID        MODE            CHAN  RATE     SIGNAL  BARS  SECURITY  
+-----------------------------------------------------------------------------------
+AP[1]          wlan0-ap-3  Infrastruktura  1     54 Mb/s  88      ****  WPA1 WPA2 
+AP[2]          wlan0-ap-2  Infrastruktura  1     54 Mb/s  61      ***   WPA1 WPA2 
+AP[3]          wlan0-ap-1  Infrastruktura  1     54 Mb/s  29      *     WPA1 WPA2 
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_002-017.expected b/clients/tests/test-client.check-on-disk/test_002-017.expected
new file mode 100644
index 00000000..61499b6d
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_002-017.expected
@@ -0,0 +1,15 @@
+location: clients/tests/test-client.py:681:test_002()/17
+cmd: $NMCLI -f AP -mode tabular -t d show wlan0
+lang: C
+returncode: 0
+stdout: 165 bytes
+>>>
+AP[1]: :wlan0-ap-3:Infra:1:54 Mbit/s:88:****:WPA1 WPA2
+AP[2]: :wlan0-ap-2:Infra:1:54 Mbit/s:61:*** :WPA1 WPA2
+AP[3]: :wlan0-ap-1:Infra:1:54 Mbit/s:29:*   :WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_002-018.expected b/clients/tests/test-client.check-on-disk/test_002-018.expected
new file mode 100644
index 00000000..bbac7a72
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_002-018.expected
@@ -0,0 +1,15 @@
+location: clients/tests/test-client.py:681:test_002()/18
+cmd: $NMCLI -f AP -mode tabular -t d show wlan0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 192 bytes
+>>>
+AP[1]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:88:****:WPA1 WPA2
+AP[2]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:61:*** :WPA1 WPA2
+AP[3]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:29:*   :WPA1 WPA2
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_002-019.expected b/clients/tests/test-client.check-on-disk/test_002-019.expected
new file mode 100644
index 00000000..0bcc5e9d
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_002-019.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:683:test_002()/19
+cmd: $NMCLI -f ALL d wifi
+lang: C
+returncode: 0
+stdout: 1840 bytes
+>>>
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-3  776C616E302D61702D33  53:8C:FC:BD:7D:2B  Infra  1     2412 MHz  54 Mbit/s  88      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-2  776C616E302D61702D32  A1:A2:78:A7:C5:D5  Infra  1     2412 MHz  54 Mbit/s  61      ***   WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[3]  wlan0-ap-1  776C616E302D61702D31  81:28:C5:C2:E5:15  Infra  1     2412 MHz  54 Mbit/s  29      *     WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   no              /org/freedesktop/NetworkManager/AccessPoint/1 
+
+NAME   SSID        SSID-HEX              BSSID              MODE   CHAN  FREQ      RATE       SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan1-ap-4  776C616E312D61702D34  EA:62:1C:BD:C0:8F  Infra  1     2412 MHz  54 Mbit/s  34      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   no              /org/freedesktop/NetworkManager/AccessPoint/4 
+
+NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_002-020.expected b/clients/tests/test-client.check-on-disk/test_002-020.expected
new file mode 100644
index 00000000..f433340e
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_002-020.expected
@@ -0,0 +1,21 @@
+location: clients/tests/test-client.py:683:test_002()/20
+cmd: $NMCLI -f ALL d wifi
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1898 bytes
+>>>
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan0-ap-3  776C616E302D61702D33  53:8C:FC:BD:7D:2B  Infrastruktura  1     2412 MHz  54 Mb/s  88      ****  WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/3 
+AP[2]  wlan0-ap-2  776C616E302D61702D32  A1:A2:78:A7:C5:D5  Infrastruktura  1     2412 MHz  54 Mb/s  61      ***   WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/2 
+AP[3]  wlan0-ap-1  776C616E302D61702D31  81:28:C5:C2:E5:15  Infrastruktura  1     2412 MHz  54 Mb/s  29      *     WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan0   nie             /org/freedesktop/NetworkManager/AccessPoint/1 
+
+NAME   SSID        SSID-HEX              BSSID              MODE            CHAN  FREQ      RATE     SIGNAL  BARS  SECURITY   WPA-FLAGS                                      RSN-FLAGS                                      DEVICE  ACTIVE  IN-USE  DBUS-PATH                                     
+AP[1]  wlan1-ap-4  776C616E312D61702D34  EA:62:1C:BD:C0:8F  Infrastruktura  1     2412 MHz  54 Mb/s  34      **    WPA1 WPA2  pair_tkip pair_ccmp group_tkip group_ccmp psk  pair_tkip pair_ccmp group_tkip group_ccmp psk  wlan1   nie             /org/freedesktop/NetworkManager/AccessPoint/4 
+
+NAME  SSID  SSID-HEX  BSSID  MODE  CHAN  FREQ  RATE  SIGNAL  BARS  SECURITY  WPA-FLAGS  RSN-FLAGS  DEVICE  ACTIVE  IN-USE  DBUS-PATH 
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_002-021.expected b/clients/tests/test-client.check-on-disk/test_002-021.expected
new file mode 100644
index 00000000..8dd7f647
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_002-021.expected
@@ -0,0 +1,14 @@
+location: clients/tests/test-client.py:685:test_002()/21
+cmd: $NMCLI c
+lang: C
+returncode: 0
+stdout: 126 bytes
+>>>
+NAME   UUID                                  TYPE      DEVICE 
+con-1  5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --     
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_002-022.expected b/clients/tests/test-client.check-on-disk/test_002-022.expected
new file mode 100644
index 00000000..25d7bed2
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_002-022.expected
@@ -0,0 +1,14 @@
+location: clients/tests/test-client.py:685:test_002()/22
+cmd: $NMCLI c
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 126 bytes
+>>>
+NAME   UUID                                  TYPE      DEVICE 
+con-1  5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --     
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_002-023.expected b/clients/tests/test-client.check-on-disk/test_002-023.expected
new file mode 100644
index 00000000..43ce6419
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_002-023.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:687:test_002()/23
+cmd: $NMCLI c s con-1
+lang: C
+returncode: 0
+stdout: 990 bytes
+>>>
+connection.id:                          con-1
+connection.uuid:                        5fcfd6d7-1e63-3332-8826-a7eda103792d
+connection.stable-id:                   --
+connection.type:                        802-3-ethernet
+connection.interface-name:              --
+connection.autoconnect:                 yes
+connection.autoconnect-priority:        0
+connection.autoconnect-retries:         -1 (default)
+connection.auth-retries:                -1
+connection.timestamp:                   0
+connection.read-only:                   no
+connection.permissions:                 --
+connection.zone:                        --
+connection.master:                      --
+connection.slave-type:                  --
+connection.autoconnect-slaves:          -1 (default)
+connection.secondaries:                 --
+connection.gateway-ping-timeout:        0
+connection.metered:                     unknown
+connection.lldp:                        default
+connection.mdns:                        -1 (default)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_002-024.expected b/clients/tests/test-client.check-on-disk/test_002-024.expected
new file mode 100644
index 00000000..a5b7bc4a
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_002-024.expected
@@ -0,0 +1,33 @@
+location: clients/tests/test-client.py:687:test_002()/24
+cmd: $NMCLI c s con-1
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 992 bytes
+>>>
+connection.id:                          con-1
+connection.uuid:                        5fcfd6d7-1e63-3332-8826-a7eda103792d
+connection.stable-id:                   --
+connection.type:                        802-3-ethernet
+connection.interface-name:              --
+connection.autoconnect:                 tak
+connection.autoconnect-priority:        0
+connection.autoconnect-retries:         -1 (default)
+connection.auth-retries:                -1
+connection.timestamp:                   0
+connection.read-only:                   nie
+connection.permissions:                 --
+connection.zone:                        --
+connection.master:                      --
+connection.slave-type:                  --
+connection.autoconnect-slaves:          -1 (default)
+connection.secondaries:                 --
+connection.gateway-ping-timeout:        0
+connection.metered:                     nieznane
+connection.lldp:                        default
+connection.mdns:                        -1 (default)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-001.expected b/clients/tests/test-client.check-on-disk/test_003-001.expected
new file mode 100644
index 00000000..e131cb36
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-001.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:697:test_003()/1
+cmd: $NMCLI c add type ethernet ifname '*' con-name con-xx1
+lang: C
+returncode: 0
+stdout: 80 bytes
+>>>
+Connection 'con-xx1' (UUID-con-xx1-REPLACED-REPLACED-REPLA) successfully added.
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-002.expected b/clients/tests/test-client.check-on-disk/test_003-002.expected
new file mode 100644
index 00000000..9c9cfb2d
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-002.expected
@@ -0,0 +1,15 @@
+location: clients/tests/test-client.py:700:test_003()/2
+cmd: $NMCLI c s
+lang: C
+returncode: 0
+stdout: 195 bytes
+>>>
+NAME     UUID                                  TYPE      DEVICE 
+con-1    5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --     
+con-xx1  UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --     
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-003.expected b/clients/tests/test-client.check-on-disk/test_003-003.expected
new file mode 100644
index 00000000..882d1b4d
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-003.expected
@@ -0,0 +1,15 @@
+location: clients/tests/test-client.py:700:test_003()/3
+cmd: $NMCLI c s
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 195 bytes
+>>>
+NAME     UUID                                  TYPE      DEVICE 
+con-1    5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --     
+con-xx1  UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --     
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-004.expected b/clients/tests/test-client.check-on-disk/test_003-004.expected
new file mode 100644
index 00000000..37c67f27
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-004.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:705:test_003()/4
+cmd: $NMCLI c add type ethernet ifname '*'
+lang: C
+returncode: 0
+stdout: 81 bytes
+>>>
+Connection 'ethernet' (UUID-ethernet-REPLACED-REPLACED-REPL) successfully added.
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-005.expected b/clients/tests/test-client.check-on-disk/test_003-005.expected
new file mode 100644
index 00000000..15ef586b
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-005.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:708:test_003()/5
+cmd: $NMCLI c s
+lang: C
+returncode: 0
+stdout: 264 bytes
+>>>
+NAME      UUID                                  TYPE      DEVICE 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --     
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --     
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --     
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-006.expected b/clients/tests/test-client.check-on-disk/test_003-006.expected
new file mode 100644
index 00000000..cd89b202
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-006.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:708:test_003()/6
+cmd: $NMCLI c s
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 264 bytes
+>>>
+NAME      UUID                                  TYPE      DEVICE 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --     
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --     
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  --     
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-007.expected b/clients/tests/test-client.check-on-disk/test_003-007.expected
new file mode 100644
index 00000000..c2e5a566
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-007.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:711:test_003()/7
+cmd: $NMCLI -f ALL c s
+lang: C
+returncode: 0
+stdout: 912 bytes
+>>>
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE  ACTIVE-PATH  SLAVE 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --     --           --    
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --     --           --    
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  no      --      --     --           --    
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-008.expected b/clients/tests/test-client.check-on-disk/test_003-008.expected
new file mode 100644
index 00000000..1100563f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-008.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:711:test_003()/8
+cmd: $NMCLI -f ALL c s
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 912 bytes
+>>>
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE  ACTIVE-PATH  SLAVE 
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --     --           --    
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --     --           --    
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  nie     --      --     --           --    
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-009.expected b/clients/tests/test-client.check-on-disk/test_003-009.expected
new file mode 100644
index 00000000..f3d9d292
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-009.expected
@@ -0,0 +1,22 @@
+location: clients/tests/test-client.py:715:test_003()/9
+cmd: $NMCLI --complete-args -f ALL c s ''
+lang: C
+returncode: 0
+stdout: 64 bytes
+>>>
+
+--active
+--order
+apath
+con-1
+con-xx1
+ethernet
+help
+id
+path
+uuid
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-010.expected b/clients/tests/test-client.check-on-disk/test_003-010.expected
new file mode 100644
index 00000000..86c4dea0
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-010.expected
@@ -0,0 +1,22 @@
+location: clients/tests/test-client.py:715:test_003()/10
+cmd: $NMCLI --complete-args -f ALL c s ''
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 64 bytes
+>>>
+
+--active
+--order
+apath
+con-1
+con-xx1
+ethernet
+help
+id
+path
+uuid
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-011.expected b/clients/tests/test-client.check-on-disk/test_003-011.expected
new file mode 100644
index 00000000..3da70bbf
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-011.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:728:test_003()/11
+cmd: $NMCLI con up ethernet ifname eth0
+lang: C
+returncode: 0
+stdout: 106 bytes
+>>>
+Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkManager/ActiveConnection/1)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-012.expected b/clients/tests/test-client.check-on-disk/test_003-012.expected
new file mode 100644
index 00000000..810ffc8b
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-012.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:731:test_003()/12
+cmd: $NMCLI con
+lang: C
+returncode: 0
+stdout: 264 bytes
+>>>
+NAME      UUID                                  TYPE      DEVICE 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  eth0   
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --     
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --     
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-013.expected b/clients/tests/test-client.check-on-disk/test_003-013.expected
new file mode 100644
index 00000000..b17bbf28
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-013.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:731:test_003()/13
+cmd: $NMCLI con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 264 bytes
+>>>
+NAME      UUID                                  TYPE      DEVICE 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  eth0   
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --     
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --     
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-014.expected b/clients/tests/test-client.check-on-disk/test_003-014.expected
new file mode 100644
index 00000000..da785a2c
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-014.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:734:test_003()/14
+cmd: $NMCLI -f ALL con
+lang: C
+returncode: 0
+stdout: 1084 bytes
+>>>
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE      ACTIVE-PATH                                         SLAVE 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  yes     eth0    activated  /org/freedesktop/NetworkManager/ActiveConnection/1  --    
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --         --                                                  --    
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --         --                                                  --    
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-015.expected b/clients/tests/test-client.check-on-disk/test_003-015.expected
new file mode 100644
index 00000000..ad645f8f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-015.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:734:test_003()/15
+cmd: $NMCLI -f ALL con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1088 bytes
+>>>
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE       ACTIVE-PATH                                         SLAVE 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  tak     eth0    aktywowano  /org/freedesktop/NetworkManager/ActiveConnection/1  --    
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --          --                                                  --    
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --          --                                                  --    
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-016.expected b/clients/tests/test-client.check-on-disk/test_003-016.expected
new file mode 100644
index 00000000..8d68221f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-016.expected
@@ -0,0 +1,90 @@
+location: clients/tests/test-client.py:737:test_003()/16
+cmd: $NMCLI -f ALL con s ethernet
+lang: C
+returncode: 0
+stdout: 3516 bytes
+>>>
+connection.id:                          ethernet
+connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:                   --
+connection.type:                        802-3-ethernet
+connection.interface-name:              --
+connection.autoconnect:                 yes
+connection.autoconnect-priority:        0
+connection.autoconnect-retries:         -1 (default)
+connection.auth-retries:                -1
+connection.timestamp:                   0
+connection.read-only:                   no
+connection.permissions:                 --
+connection.zone:                        --
+connection.master:                      --
+connection.slave-type:                  --
+connection.autoconnect-slaves:          -1 (default)
+connection.secondaries:                 --
+connection.gateway-ping-timeout:        0
+connection.metered:                     unknown
+connection.lldp:                        default
+connection.mdns:                        -1 (default)
+802-3-ethernet.port:                    --
+802-3-ethernet.speed:                   0
+802-3-ethernet.duplex:                  --
+802-3-ethernet.auto-negotiate:          no
+802-3-ethernet.mac-address:             --
+802-3-ethernet.cloned-mac-address:      --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist:   --
+802-3-ethernet.mtu:                     auto
+802-3-ethernet.s390-subchannels:        --
+802-3-ethernet.s390-nettype:            --
+802-3-ethernet.s390-options:            --
+802-3-ethernet.wake-on-lan:             default
+802-3-ethernet.wake-on-lan-password:    --
+ipv4.method:                            auto
+ipv4.dns:                               --
+ipv4.dns-search:                        --
+ipv4.dns-options:                       ""
+ipv4.dns-priority:                      0
+ipv4.addresses:                         --
+ipv4.gateway:                           --
+ipv4.routes:                            --
+ipv4.route-metric:                      -1
+ipv4.route-table:                       0 (unspec)
+ipv4.ignore-auto-routes:                no
+ipv4.ignore-auto-dns:                   no
+ipv4.dhcp-client-id:                    --
+ipv4.dhcp-timeout:                      0 (default)
+ipv4.dhcp-send-hostname:                yes
+ipv4.dhcp-hostname:                     --
+ipv4.dhcp-fqdn:                         --
+ipv4.never-default:                     no
+ipv4.may-fail:                          yes
+ipv4.dad-timeout:                       -1 (default)
+ipv6.method:                            auto
+ipv6.dns:                               --
+ipv6.dns-search:                        --
+ipv6.dns-options:                       ""
+ipv6.dns-priority:                      0
+ipv6.addresses:                         --
+ipv6.gateway:                           --
+ipv6.routes:                            --
+ipv6.route-metric:                      -1
+ipv6.route-table:                       0 (unspec)
+ipv6.ignore-auto-routes:                no
+ipv6.ignore-auto-dns:                   no
+ipv6.never-default:                     no
+ipv6.may-fail:                          yes
+ipv6.ip6-privacy:                       -1 (unknown)
+ipv6.addr-gen-mode:                     stable-privacy
+ipv6.dhcp-send-hostname:                yes
+ipv6.dhcp-hostname:                     --
+ipv6.token:                             --
+proxy.method:                           none
+proxy.browser-only:                     no
+proxy.pac-url:                          --
+proxy.pac-script:                       --
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-017.expected b/clients/tests/test-client.check-on-disk/test_003-017.expected
new file mode 100644
index 00000000..7e99138c
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-017.expected
@@ -0,0 +1,90 @@
+location: clients/tests/test-client.py:737:test_003()/17
+cmd: $NMCLI -f ALL con s ethernet
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 3534 bytes
+>>>
+connection.id:                          ethernet
+connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:                   --
+connection.type:                        802-3-ethernet
+connection.interface-name:              --
+connection.autoconnect:                 tak
+connection.autoconnect-priority:        0
+connection.autoconnect-retries:         -1 (default)
+connection.auth-retries:                -1
+connection.timestamp:                   0
+connection.read-only:                   nie
+connection.permissions:                 --
+connection.zone:                        --
+connection.master:                      --
+connection.slave-type:                  --
+connection.autoconnect-slaves:          -1 (default)
+connection.secondaries:                 --
+connection.gateway-ping-timeout:        0
+connection.metered:                     nieznane
+connection.lldp:                        default
+connection.mdns:                        -1 (default)
+802-3-ethernet.port:                    --
+802-3-ethernet.speed:                   0
+802-3-ethernet.duplex:                  --
+802-3-ethernet.auto-negotiate:          nie
+802-3-ethernet.mac-address:             --
+802-3-ethernet.cloned-mac-address:      --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist:   --
+802-3-ethernet.mtu:                     automatyczne
+802-3-ethernet.s390-subchannels:        --
+802-3-ethernet.s390-nettype:            --
+802-3-ethernet.s390-options:            --
+802-3-ethernet.wake-on-lan:             default
+802-3-ethernet.wake-on-lan-password:    --
+ipv4.method:                            auto
+ipv4.dns:                               --
+ipv4.dns-search:                        --
+ipv4.dns-options:                       ""
+ipv4.dns-priority:                      0
+ipv4.addresses:                         --
+ipv4.gateway:                           --
+ipv4.routes:                            --
+ipv4.route-metric:                      -1
+ipv4.route-table:                       0 (unspec)
+ipv4.ignore-auto-routes:                nie
+ipv4.ignore-auto-dns:                   nie
+ipv4.dhcp-client-id:                    --
+ipv4.dhcp-timeout:                      0 (default)
+ipv4.dhcp-send-hostname:                tak
+ipv4.dhcp-hostname:                     --
+ipv4.dhcp-fqdn:                         --
+ipv4.never-default:                     nie
+ipv4.may-fail:                          tak
+ipv4.dad-timeout:                       -1 (default)
+ipv6.method:                            auto
+ipv6.dns:                               --
+ipv6.dns-search:                        --
+ipv6.dns-options:                       ""
+ipv6.dns-priority:                      0
+ipv6.addresses:                         --
+ipv6.gateway:                           --
+ipv6.routes:                            --
+ipv6.route-metric:                      -1
+ipv6.route-table:                       0 (unspec)
+ipv6.ignore-auto-routes:                nie
+ipv6.ignore-auto-dns:                   nie
+ipv6.never-default:                     nie
+ipv6.may-fail:                          tak
+ipv6.ip6-privacy:                       -1 (unknown)
+ipv6.addr-gen-mode:                     stable-privacy
+ipv6.dhcp-send-hostname:                tak
+ipv6.dhcp-hostname:                     --
+ipv6.token:                             --
+proxy.method:                           none
+proxy.browser-only:                     nie
+proxy.pac-url:                          --
+proxy.pac-script:                       --
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-018.expected b/clients/tests/test-client.check-on-disk/test_003-018.expected
new file mode 100644
index 00000000..bc74883d
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-018.expected
@@ -0,0 +1,102 @@
+location: clients/tests/test-client.py:740:test_003()/18
+cmd: $NMCLI con s ethernet
+lang: C
+returncode: 0
+stdout: 4180 bytes
+>>>
+connection.id:                          ethernet
+connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:                   --
+connection.type:                        802-3-ethernet
+connection.interface-name:              --
+connection.autoconnect:                 yes
+connection.autoconnect-priority:        0
+connection.autoconnect-retries:         -1 (default)
+connection.auth-retries:                -1
+connection.timestamp:                   0
+connection.read-only:                   no
+connection.permissions:                 --
+connection.zone:                        --
+connection.master:                      --
+connection.slave-type:                  --
+connection.autoconnect-slaves:          -1 (default)
+connection.secondaries:                 --
+connection.gateway-ping-timeout:        0
+connection.metered:                     unknown
+connection.lldp:                        default
+connection.mdns:                        -1 (default)
+802-3-ethernet.port:                    --
+802-3-ethernet.speed:                   0
+802-3-ethernet.duplex:                  --
+802-3-ethernet.auto-negotiate:          no
+802-3-ethernet.mac-address:             --
+802-3-ethernet.cloned-mac-address:      --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist:   --
+802-3-ethernet.mtu:                     auto
+802-3-ethernet.s390-subchannels:        --
+802-3-ethernet.s390-nettype:            --
+802-3-ethernet.s390-options:            --
+802-3-ethernet.wake-on-lan:             default
+802-3-ethernet.wake-on-lan-password:    --
+ipv4.method:                            auto
+ipv4.dns:                               --
+ipv4.dns-search:                        --
+ipv4.dns-options:                       ""
+ipv4.dns-priority:                      0
+ipv4.addresses:                         --
+ipv4.gateway:                           --
+ipv4.routes:                            --
+ipv4.route-metric:                      -1
+ipv4.route-table:                       0 (unspec)
+ipv4.ignore-auto-routes:                no
+ipv4.ignore-auto-dns:                   no
+ipv4.dhcp-client-id:                    --
+ipv4.dhcp-timeout:                      0 (default)
+ipv4.dhcp-send-hostname:                yes
+ipv4.dhcp-hostname:                     --
+ipv4.dhcp-fqdn:                         --
+ipv4.never-default:                     no
+ipv4.may-fail:                          yes
+ipv4.dad-timeout:                       -1 (default)
+ipv6.method:                            auto
+ipv6.dns:                               --
+ipv6.dns-search:                        --
+ipv6.dns-options:                       ""
+ipv6.dns-priority:                      0
+ipv6.addresses:                         --
+ipv6.gateway:                           --
+ipv6.routes:                            --
+ipv6.route-metric:                      -1
+ipv6.route-table:                       0 (unspec)
+ipv6.ignore-auto-routes:                no
+ipv6.ignore-auto-dns:                   no
+ipv6.never-default:                     no
+ipv6.may-fail:                          yes
+ipv6.ip6-privacy:                       -1 (unknown)
+ipv6.addr-gen-mode:                     stable-privacy
+ipv6.dhcp-send-hostname:                yes
+ipv6.dhcp-hostname:                     --
+ipv6.token:                             --
+proxy.method:                           none
+proxy.browser-only:                     no
+proxy.pac-url:                          --
+proxy.pac-script:                       --
+GENERAL.NAME:                           ethernet
+GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:                        eth0
+GENERAL.STATE:                          activated
+GENERAL.DEFAULT:                        no
+GENERAL.DEFAULT6:                       no
+GENERAL.SPEC-OBJECT:                    --
+GENERAL.VPN:                            no
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:                           --
+GENERAL.MASTER-PATH:                    --
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-019.expected b/clients/tests/test-client.check-on-disk/test_003-019.expected
new file mode 100644
index 00000000..5e37312d
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-019.expected
@@ -0,0 +1,102 @@
+location: clients/tests/test-client.py:740:test_003()/19
+cmd: $NMCLI con s ethernet
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4201 bytes
+>>>
+connection.id:                          ethernet
+connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:                   --
+connection.type:                        802-3-ethernet
+connection.interface-name:              --
+connection.autoconnect:                 tak
+connection.autoconnect-priority:        0
+connection.autoconnect-retries:         -1 (default)
+connection.auth-retries:                -1
+connection.timestamp:                   0
+connection.read-only:                   nie
+connection.permissions:                 --
+connection.zone:                        --
+connection.master:                      --
+connection.slave-type:                  --
+connection.autoconnect-slaves:          -1 (default)
+connection.secondaries:                 --
+connection.gateway-ping-timeout:        0
+connection.metered:                     nieznane
+connection.lldp:                        default
+connection.mdns:                        -1 (default)
+802-3-ethernet.port:                    --
+802-3-ethernet.speed:                   0
+802-3-ethernet.duplex:                  --
+802-3-ethernet.auto-negotiate:          nie
+802-3-ethernet.mac-address:             --
+802-3-ethernet.cloned-mac-address:      --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist:   --
+802-3-ethernet.mtu:                     automatyczne
+802-3-ethernet.s390-subchannels:        --
+802-3-ethernet.s390-nettype:            --
+802-3-ethernet.s390-options:            --
+802-3-ethernet.wake-on-lan:             default
+802-3-ethernet.wake-on-lan-password:    --
+ipv4.method:                            auto
+ipv4.dns:                               --
+ipv4.dns-search:                        --
+ipv4.dns-options:                       ""
+ipv4.dns-priority:                      0
+ipv4.addresses:                         --
+ipv4.gateway:                           --
+ipv4.routes:                            --
+ipv4.route-metric:                      -1
+ipv4.route-table:                       0 (unspec)
+ipv4.ignore-auto-routes:                nie
+ipv4.ignore-auto-dns:                   nie
+ipv4.dhcp-client-id:                    --
+ipv4.dhcp-timeout:                      0 (default)
+ipv4.dhcp-send-hostname:                tak
+ipv4.dhcp-hostname:                     --
+ipv4.dhcp-fqdn:                         --
+ipv4.never-default:                     nie
+ipv4.may-fail:                          tak
+ipv4.dad-timeout:                       -1 (default)
+ipv6.method:                            auto
+ipv6.dns:                               --
+ipv6.dns-search:                        --
+ipv6.dns-options:                       ""
+ipv6.dns-priority:                      0
+ipv6.addresses:                         --
+ipv6.gateway:                           --
+ipv6.routes:                            --
+ipv6.route-metric:                      -1
+ipv6.route-table:                       0 (unspec)
+ipv6.ignore-auto-routes:                nie
+ipv6.ignore-auto-dns:                   nie
+ipv6.never-default:                     nie
+ipv6.may-fail:                          tak
+ipv6.ip6-privacy:                       -1 (unknown)
+ipv6.addr-gen-mode:                     stable-privacy
+ipv6.dhcp-send-hostname:                tak
+ipv6.dhcp-hostname:                     --
+ipv6.token:                             --
+proxy.method:                           none
+proxy.browser-only:                     nie
+proxy.pac-url:                          --
+proxy.pac-script:                       --
+GENERAL.NAME:                           ethernet
+GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:                        eth0
+GENERAL.STATE:                          activated
+GENERAL.DEFAULT:                        nie
+GENERAL.DEFAULT6:                       nie
+GENERAL.SPEC-OBJECT:                    --
+GENERAL.VPN:                            nie
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:                           --
+GENERAL.MASTER-PATH:                    --
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-020.expected b/clients/tests/test-client.check-on-disk/test_003-020.expected
new file mode 100644
index 00000000..513985a5
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-020.expected
@@ -0,0 +1,19 @@
+location: clients/tests/test-client.py:743:test_003()/20
+cmd: $NMCLI -f ALL dev s eth0
+lang: C
+returncode: 0
+stdout: 1056 bytes
+>>>
+DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+eth1    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan0   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/3  --          --                                    --                                                 
+wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+eth0    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/1  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1 
+
+<<<
+stderr: 24 bytes
+>>>
+Unknown parameter: eth0
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-021.expected b/clients/tests/test-client.check-on-disk/test_003-021.expected
new file mode 100644
index 00000000..6809f290
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-021.expected
@@ -0,0 +1,19 @@
+location: clients/tests/test-client.py:743:test_003()/21
+cmd: $NMCLI -f ALL dev s eth0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1061 bytes
+>>>
+DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+eth1    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/2  --          --                                    --                                                 
+wlan0   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/3  --          --                                    --                                                 
+wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+eth0    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/1  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1 
+
+<<<
+stderr: 24 bytes
+>>>
+Nieznany parametr: eth0
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-022.expected b/clients/tests/test-client.check-on-disk/test_003-022.expected
new file mode 100644
index 00000000..57d4e4a8
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-022.expected
@@ -0,0 +1,42 @@
+location: clients/tests/test-client.py:746:test_003()/22
+cmd: $NMCLI -f ALL dev show eth0
+lang: C
+returncode: 0
+stdout: 1487 bytes
+>>>
+GENERAL.DEVICE:                         eth0
+GENERAL.TYPE:                           ethernet
+GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.VENDOR:                         --
+GENERAL.PRODUCT:                        --
+GENERAL.DRIVER:                         virtual
+GENERAL.DRIVER-VERSION:                 --
+GENERAL.FIRMWARE-VERSION:               --
+GENERAL.HWADDR:                         72:41:AB:90:41:5D
+GENERAL.MTU:                            0
+GENERAL.STATE:                          20 (unavailable)
+GENERAL.REASON:                         0 (No reason given)
+GENERAL.UDI:                            /sys/devices/virtual/eth0
+GENERAL.IP-IFACE:                       --
+GENERAL.IS-SOFTWARE:                    no
+GENERAL.NM-MANAGED:                     yes
+GENERAL.AUTOCONNECT:                    yes
+GENERAL.FIRMWARE-MISSING:               no
+GENERAL.NM-PLUGIN-MISSING:              no
+GENERAL.PHYS-PORT-ID:                   --
+GENERAL.CONNECTION:                     ethernet
+GENERAL.CON-UUID:                       UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED:                        unknown
+CAPABILITIES.CARRIER-DETECT:            no
+CAPABILITIES.SPEED:                     100 Mb/s
+CAPABILITIES.IS-SOFTWARE:               no
+CAPABILITIES.SRIOV:                     no
+WIRED-PROPERTIES.CARRIER:               off
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: --
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-023.expected b/clients/tests/test-client.check-on-disk/test_003-023.expected
new file mode 100644
index 00000000..0455374f
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-023.expected
@@ -0,0 +1,42 @@
+location: clients/tests/test-client.py:746:test_003()/23
+cmd: $NMCLI -f ALL dev show eth0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1510 bytes
+>>>
+GENERAL.DEVICE:                         eth0
+GENERAL.TYPE:                           ethernet
+GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.VENDOR:                         --
+GENERAL.PRODUCT:                        --
+GENERAL.DRIVER:                         virtual
+GENERAL.DRIVER-VERSION:                 --
+GENERAL.FIRMWARE-VERSION:               --
+GENERAL.HWADDR:                         72:41:AB:90:41:5D
+GENERAL.MTU:                            0
+GENERAL.STATE:                          20 (niedostępne)
+GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.UDI:                            /sys/devices/virtual/eth0
+GENERAL.IP-IFACE:                       --
+GENERAL.IS-SOFTWARE:                    nie
+GENERAL.NM-MANAGED:                     tak
+GENERAL.AUTOCONNECT:                    tak
+GENERAL.FIRMWARE-MISSING:               nie
+GENERAL.NM-PLUGIN-MISSING:              nie
+GENERAL.PHYS-PORT-ID:                   --
+GENERAL.CONNECTION:                     ethernet
+GENERAL.CON-UUID:                       UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED:                        nieznane
+CAPABILITIES.CARRIER-DETECT:            nie
+CAPABILITIES.SPEED:                     100 Mb/s
+CAPABILITIES.IS-SOFTWARE:               nie
+CAPABILITIES.SRIOV:                     nie
+WIRED-PROPERTIES.CARRIER:               wyłączone
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: --
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-024.expected b/clients/tests/test-client.check-on-disk/test_003-024.expected
new file mode 100644
index 00000000..b20a45d4
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-024.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:728:test_003()/24
+cmd: $NMCLI con up ethernet ifname eth1
+lang: C
+returncode: 0
+stdout: 106 bytes
+>>>
+Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkManager/ActiveConnection/2)
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-025.expected b/clients/tests/test-client.check-on-disk/test_003-025.expected
new file mode 100644
index 00000000..3806099b
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-025.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:731:test_003()/25
+cmd: $NMCLI con
+lang: C
+returncode: 0
+stdout: 264 bytes
+>>>
+NAME      UUID                                  TYPE      DEVICE 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  eth0   
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --     
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --     
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-026.expected b/clients/tests/test-client.check-on-disk/test_003-026.expected
new file mode 100644
index 00000000..ee609134
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-026.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:731:test_003()/26
+cmd: $NMCLI con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 264 bytes
+>>>
+NAME      UUID                                  TYPE      DEVICE 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  eth0   
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  --     
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  --     
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-027.expected b/clients/tests/test-client.check-on-disk/test_003-027.expected
new file mode 100644
index 00000000..96924a42
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-027.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:734:test_003()/27
+cmd: $NMCLI -f ALL con
+lang: C
+returncode: 0
+stdout: 1084 bytes
+>>>
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE      ACTIVE-PATH                                         SLAVE 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  yes     eth0    activated  /org/freedesktop/NetworkManager/ActiveConnection/1  --    
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --         --                                                  --    
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --         --                                                  --    
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-028.expected b/clients/tests/test-client.check-on-disk/test_003-028.expected
new file mode 100644
index 00000000..6065d1ea
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-028.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:734:test_003()/28
+cmd: $NMCLI -f ALL con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1088 bytes
+>>>
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE       ACTIVE-PATH                                         SLAVE 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  tak     eth0    aktywowano  /org/freedesktop/NetworkManager/ActiveConnection/1  --    
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --          --                                                  --    
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --          --                                                  --    
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-029.expected b/clients/tests/test-client.check-on-disk/test_003-029.expected
new file mode 100644
index 00000000..ebb89619
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-029.expected
@@ -0,0 +1,90 @@
+location: clients/tests/test-client.py:737:test_003()/29
+cmd: $NMCLI -f ALL con s ethernet
+lang: C
+returncode: 0
+stdout: 3516 bytes
+>>>
+connection.id:                          ethernet
+connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:                   --
+connection.type:                        802-3-ethernet
+connection.interface-name:              --
+connection.autoconnect:                 yes
+connection.autoconnect-priority:        0
+connection.autoconnect-retries:         -1 (default)
+connection.auth-retries:                -1
+connection.timestamp:                   0
+connection.read-only:                   no
+connection.permissions:                 --
+connection.zone:                        --
+connection.master:                      --
+connection.slave-type:                  --
+connection.autoconnect-slaves:          -1 (default)
+connection.secondaries:                 --
+connection.gateway-ping-timeout:        0
+connection.metered:                     unknown
+connection.lldp:                        default
+connection.mdns:                        -1 (default)
+802-3-ethernet.port:                    --
+802-3-ethernet.speed:                   0
+802-3-ethernet.duplex:                  --
+802-3-ethernet.auto-negotiate:          no
+802-3-ethernet.mac-address:             --
+802-3-ethernet.cloned-mac-address:      --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist:   --
+802-3-ethernet.mtu:                     auto
+802-3-ethernet.s390-subchannels:        --
+802-3-ethernet.s390-nettype:            --
+802-3-ethernet.s390-options:            --
+802-3-ethernet.wake-on-lan:             default
+802-3-ethernet.wake-on-lan-password:    --
+ipv4.method:                            auto
+ipv4.dns:                               --
+ipv4.dns-search:                        --
+ipv4.dns-options:                       ""
+ipv4.dns-priority:                      0
+ipv4.addresses:                         --
+ipv4.gateway:                           --
+ipv4.routes:                            --
+ipv4.route-metric:                      -1
+ipv4.route-table:                       0 (unspec)
+ipv4.ignore-auto-routes:                no
+ipv4.ignore-auto-dns:                   no
+ipv4.dhcp-client-id:                    --
+ipv4.dhcp-timeout:                      0 (default)
+ipv4.dhcp-send-hostname:                yes
+ipv4.dhcp-hostname:                     --
+ipv4.dhcp-fqdn:                         --
+ipv4.never-default:                     no
+ipv4.may-fail:                          yes
+ipv4.dad-timeout:                       -1 (default)
+ipv6.method:                            auto
+ipv6.dns:                               --
+ipv6.dns-search:                        --
+ipv6.dns-options:                       ""
+ipv6.dns-priority:                      0
+ipv6.addresses:                         --
+ipv6.gateway:                           --
+ipv6.routes:                            --
+ipv6.route-metric:                      -1
+ipv6.route-table:                       0 (unspec)
+ipv6.ignore-auto-routes:                no
+ipv6.ignore-auto-dns:                   no
+ipv6.never-default:                     no
+ipv6.may-fail:                          yes
+ipv6.ip6-privacy:                       -1 (unknown)
+ipv6.addr-gen-mode:                     stable-privacy
+ipv6.dhcp-send-hostname:                yes
+ipv6.dhcp-hostname:                     --
+ipv6.token:                             --
+proxy.method:                           none
+proxy.browser-only:                     no
+proxy.pac-url:                          --
+proxy.pac-script:                       --
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
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
new file mode 100644
index 00000000..adf743d8
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-030.expected
@@ -0,0 +1,90 @@
+location: clients/tests/test-client.py:737:test_003()/30
+cmd: $NMCLI -f ALL con s ethernet
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 3534 bytes
+>>>
+connection.id:                          ethernet
+connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:                   --
+connection.type:                        802-3-ethernet
+connection.interface-name:              --
+connection.autoconnect:                 tak
+connection.autoconnect-priority:        0
+connection.autoconnect-retries:         -1 (default)
+connection.auth-retries:                -1
+connection.timestamp:                   0
+connection.read-only:                   nie
+connection.permissions:                 --
+connection.zone:                        --
+connection.master:                      --
+connection.slave-type:                  --
+connection.autoconnect-slaves:          -1 (default)
+connection.secondaries:                 --
+connection.gateway-ping-timeout:        0
+connection.metered:                     nieznane
+connection.lldp:                        default
+connection.mdns:                        -1 (default)
+802-3-ethernet.port:                    --
+802-3-ethernet.speed:                   0
+802-3-ethernet.duplex:                  --
+802-3-ethernet.auto-negotiate:          nie
+802-3-ethernet.mac-address:             --
+802-3-ethernet.cloned-mac-address:      --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist:   --
+802-3-ethernet.mtu:                     automatyczne
+802-3-ethernet.s390-subchannels:        --
+802-3-ethernet.s390-nettype:            --
+802-3-ethernet.s390-options:            --
+802-3-ethernet.wake-on-lan:             default
+802-3-ethernet.wake-on-lan-password:    --
+ipv4.method:                            auto
+ipv4.dns:                               --
+ipv4.dns-search:                        --
+ipv4.dns-options:                       ""
+ipv4.dns-priority:                      0
+ipv4.addresses:                         --
+ipv4.gateway:                           --
+ipv4.routes:                            --
+ipv4.route-metric:                      -1
+ipv4.route-table:                       0 (unspec)
+ipv4.ignore-auto-routes:                nie
+ipv4.ignore-auto-dns:                   nie
+ipv4.dhcp-client-id:                    --
+ipv4.dhcp-timeout:                      0 (default)
+ipv4.dhcp-send-hostname:                tak
+ipv4.dhcp-hostname:                     --
+ipv4.dhcp-fqdn:                         --
+ipv4.never-default:                     nie
+ipv4.may-fail:                          tak
+ipv4.dad-timeout:                       -1 (default)
+ipv6.method:                            auto
+ipv6.dns:                               --
+ipv6.dns-search:                        --
+ipv6.dns-options:                       ""
+ipv6.dns-priority:                      0
+ipv6.addresses:                         --
+ipv6.gateway:                           --
+ipv6.routes:                            --
+ipv6.route-metric:                      -1
+ipv6.route-table:                       0 (unspec)
+ipv6.ignore-auto-routes:                nie
+ipv6.ignore-auto-dns:                   nie
+ipv6.never-default:                     nie
+ipv6.may-fail:                          tak
+ipv6.ip6-privacy:                       -1 (unknown)
+ipv6.addr-gen-mode:                     stable-privacy
+ipv6.dhcp-send-hostname:                tak
+ipv6.dhcp-hostname:                     --
+ipv6.token:                             --
+proxy.method:                           none
+proxy.browser-only:                     nie
+proxy.pac-url:                          --
+proxy.pac-script:                       --
+
+<<<
+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
new file mode 100644
index 00000000..cbf57afc
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-031.expected
@@ -0,0 +1,115 @@
+location: clients/tests/test-client.py:740:test_003()/31
+cmd: $NMCLI con s ethernet
+lang: C
+returncode: 0
+stdout: 4845 bytes
+>>>
+connection.id:                          ethernet
+connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:                   --
+connection.type:                        802-3-ethernet
+connection.interface-name:              --
+connection.autoconnect:                 yes
+connection.autoconnect-priority:        0
+connection.autoconnect-retries:         -1 (default)
+connection.auth-retries:                -1
+connection.timestamp:                   0
+connection.read-only:                   no
+connection.permissions:                 --
+connection.zone:                        --
+connection.master:                      --
+connection.slave-type:                  --
+connection.autoconnect-slaves:          -1 (default)
+connection.secondaries:                 --
+connection.gateway-ping-timeout:        0
+connection.metered:                     unknown
+connection.lldp:                        default
+connection.mdns:                        -1 (default)
+802-3-ethernet.port:                    --
+802-3-ethernet.speed:                   0
+802-3-ethernet.duplex:                  --
+802-3-ethernet.auto-negotiate:          no
+802-3-ethernet.mac-address:             --
+802-3-ethernet.cloned-mac-address:      --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist:   --
+802-3-ethernet.mtu:                     auto
+802-3-ethernet.s390-subchannels:        --
+802-3-ethernet.s390-nettype:            --
+802-3-ethernet.s390-options:            --
+802-3-ethernet.wake-on-lan:             default
+802-3-ethernet.wake-on-lan-password:    --
+ipv4.method:                            auto
+ipv4.dns:                               --
+ipv4.dns-search:                        --
+ipv4.dns-options:                       ""
+ipv4.dns-priority:                      0
+ipv4.addresses:                         --
+ipv4.gateway:                           --
+ipv4.routes:                            --
+ipv4.route-metric:                      -1
+ipv4.route-table:                       0 (unspec)
+ipv4.ignore-auto-routes:                no
+ipv4.ignore-auto-dns:                   no
+ipv4.dhcp-client-id:                    --
+ipv4.dhcp-timeout:                      0 (default)
+ipv4.dhcp-send-hostname:                yes
+ipv4.dhcp-hostname:                     --
+ipv4.dhcp-fqdn:                         --
+ipv4.never-default:                     no
+ipv4.may-fail:                          yes
+ipv4.dad-timeout:                       -1 (default)
+ipv6.method:                            auto
+ipv6.dns:                               --
+ipv6.dns-search:                        --
+ipv6.dns-options:                       ""
+ipv6.dns-priority:                      0
+ipv6.addresses:                         --
+ipv6.gateway:                           --
+ipv6.routes:                            --
+ipv6.route-metric:                      -1
+ipv6.route-table:                       0 (unspec)
+ipv6.ignore-auto-routes:                no
+ipv6.ignore-auto-dns:                   no
+ipv6.never-default:                     no
+ipv6.may-fail:                          yes
+ipv6.ip6-privacy:                       -1 (unknown)
+ipv6.addr-gen-mode:                     stable-privacy
+ipv6.dhcp-send-hostname:                yes
+ipv6.dhcp-hostname:                     --
+ipv6.token:                             --
+proxy.method:                           none
+proxy.browser-only:                     no
+proxy.pac-url:                          --
+proxy.pac-script:                       --
+GENERAL.NAME:                           ethernet
+GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:                        eth0
+GENERAL.STATE:                          activated
+GENERAL.DEFAULT:                        no
+GENERAL.DEFAULT6:                       no
+GENERAL.SPEC-OBJECT:                    --
+GENERAL.VPN:                            no
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:                           --
+GENERAL.MASTER-PATH:                    --
+
+GENERAL.NAME:                           ethernet
+GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:                        eth1
+GENERAL.STATE:                          activated
+GENERAL.DEFAULT:                        no
+GENERAL.DEFAULT6:                       no
+GENERAL.SPEC-OBJECT:                    --
+GENERAL.VPN:                            no
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:                           --
+GENERAL.MASTER-PATH:                    --
+
+<<<
+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
new file mode 100644
index 00000000..e5d74a1b
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-032.expected
@@ -0,0 +1,115 @@
+location: clients/tests/test-client.py:740:test_003()/32
+cmd: $NMCLI con s ethernet
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4869 bytes
+>>>
+connection.id:                          ethernet
+connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:                   --
+connection.type:                        802-3-ethernet
+connection.interface-name:              --
+connection.autoconnect:                 tak
+connection.autoconnect-priority:        0
+connection.autoconnect-retries:         -1 (default)
+connection.auth-retries:                -1
+connection.timestamp:                   0
+connection.read-only:                   nie
+connection.permissions:                 --
+connection.zone:                        --
+connection.master:                      --
+connection.slave-type:                  --
+connection.autoconnect-slaves:          -1 (default)
+connection.secondaries:                 --
+connection.gateway-ping-timeout:        0
+connection.metered:                     nieznane
+connection.lldp:                        default
+connection.mdns:                        -1 (default)
+802-3-ethernet.port:                    --
+802-3-ethernet.speed:                   0
+802-3-ethernet.duplex:                  --
+802-3-ethernet.auto-negotiate:          nie
+802-3-ethernet.mac-address:             --
+802-3-ethernet.cloned-mac-address:      --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist:   --
+802-3-ethernet.mtu:                     automatyczne
+802-3-ethernet.s390-subchannels:        --
+802-3-ethernet.s390-nettype:            --
+802-3-ethernet.s390-options:            --
+802-3-ethernet.wake-on-lan:             default
+802-3-ethernet.wake-on-lan-password:    --
+ipv4.method:                            auto
+ipv4.dns:                               --
+ipv4.dns-search:                        --
+ipv4.dns-options:                       ""
+ipv4.dns-priority:                      0
+ipv4.addresses:                         --
+ipv4.gateway:                           --
+ipv4.routes:                            --
+ipv4.route-metric:                      -1
+ipv4.route-table:                       0 (unspec)
+ipv4.ignore-auto-routes:                nie
+ipv4.ignore-auto-dns:                   nie
+ipv4.dhcp-client-id:                    --
+ipv4.dhcp-timeout:                      0 (default)
+ipv4.dhcp-send-hostname:                tak
+ipv4.dhcp-hostname:                     --
+ipv4.dhcp-fqdn:                         --
+ipv4.never-default:                     nie
+ipv4.may-fail:                          tak
+ipv4.dad-timeout:                       -1 (default)
+ipv6.method:                            auto
+ipv6.dns:                               --
+ipv6.dns-search:                        --
+ipv6.dns-options:                       ""
+ipv6.dns-priority:                      0
+ipv6.addresses:                         --
+ipv6.gateway:                           --
+ipv6.routes:                            --
+ipv6.route-metric:                      -1
+ipv6.route-table:                       0 (unspec)
+ipv6.ignore-auto-routes:                nie
+ipv6.ignore-auto-dns:                   nie
+ipv6.never-default:                     nie
+ipv6.may-fail:                          tak
+ipv6.ip6-privacy:                       -1 (unknown)
+ipv6.addr-gen-mode:                     stable-privacy
+ipv6.dhcp-send-hostname:                tak
+ipv6.dhcp-hostname:                     --
+ipv6.token:                             --
+proxy.method:                           none
+proxy.browser-only:                     nie
+proxy.pac-url:                          --
+proxy.pac-script:                       --
+GENERAL.NAME:                           ethernet
+GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:                        eth0
+GENERAL.STATE:                          activated
+GENERAL.DEFAULT:                        nie
+GENERAL.DEFAULT6:                       nie
+GENERAL.SPEC-OBJECT:                    --
+GENERAL.VPN:                            nie
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:                           --
+GENERAL.MASTER-PATH:                    --
+
+GENERAL.NAME:                           ethernet
+GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:                        eth1
+GENERAL.STATE:                          activated
+GENERAL.DEFAULT:                        nie
+GENERAL.DEFAULT6:                       nie
+GENERAL.SPEC-OBJECT:                    --
+GENERAL.VPN:                            nie
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:                           --
+GENERAL.MASTER-PATH:                    --
+
+<<<
+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
new file mode 100644
index 00000000..46b70521
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-033.expected
@@ -0,0 +1,19 @@
+location: clients/tests/test-client.py:743:test_003()/33
+cmd: $NMCLI -f ALL dev s eth0
+lang: C
+returncode: 0
+stdout: 1056 bytes
+>>>
+DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+wlan0   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/3  --          --                                    --                                                 
+wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      unavailable  /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+eth0    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/1  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1 
+eth1    ethernet  unavailable  /org/freedesktop/NetworkManager/Devices/2  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/2 
+
+<<<
+stderr: 24 bytes
+>>>
+Unknown parameter: eth0
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-034.expected b/clients/tests/test-client.check-on-disk/test_003-034.expected
new file mode 100644
index 00000000..77cc99fd
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-034.expected
@@ -0,0 +1,19 @@
+location: clients/tests/test-client.py:743:test_003()/34
+cmd: $NMCLI -f ALL dev s eth0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1061 bytes
+>>>
+DEVICE  TYPE      STATE        DBUS-PATH                                  CONNECTION  CON-UUID                              CON-PATH                                           
+wlan0   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/3  --          --                                    --                                                 
+wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/4  --          --                                    --                                                 
+wlan1   wifi      niedostępne  /org/freedesktop/NetworkManager/Devices/5  --          --                                    --                                                 
+eth0    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/1  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/1 
+eth1    ethernet  niedostępne  /org/freedesktop/NetworkManager/Devices/2  ethernet    UUID-ethernet-REPLACED-REPLACED-REPL  /org/freedesktop/NetworkManager/ActiveConnection/2 
+
+<<<
+stderr: 24 bytes
+>>>
+Nieznany parametr: eth0
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-035.expected b/clients/tests/test-client.check-on-disk/test_003-035.expected
new file mode 100644
index 00000000..ae928657
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-035.expected
@@ -0,0 +1,42 @@
+location: clients/tests/test-client.py:746:test_003()/35
+cmd: $NMCLI -f ALL dev show eth0
+lang: C
+returncode: 0
+stdout: 1487 bytes
+>>>
+GENERAL.DEVICE:                         eth0
+GENERAL.TYPE:                           ethernet
+GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.VENDOR:                         --
+GENERAL.PRODUCT:                        --
+GENERAL.DRIVER:                         virtual
+GENERAL.DRIVER-VERSION:                 --
+GENERAL.FIRMWARE-VERSION:               --
+GENERAL.HWADDR:                         72:41:AB:90:41:5D
+GENERAL.MTU:                            0
+GENERAL.STATE:                          20 (unavailable)
+GENERAL.REASON:                         0 (No reason given)
+GENERAL.UDI:                            /sys/devices/virtual/eth0
+GENERAL.IP-IFACE:                       --
+GENERAL.IS-SOFTWARE:                    no
+GENERAL.NM-MANAGED:                     yes
+GENERAL.AUTOCONNECT:                    yes
+GENERAL.FIRMWARE-MISSING:               no
+GENERAL.NM-PLUGIN-MISSING:              no
+GENERAL.PHYS-PORT-ID:                   --
+GENERAL.CONNECTION:                     ethernet
+GENERAL.CON-UUID:                       UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED:                        unknown
+CAPABILITIES.CARRIER-DETECT:            no
+CAPABILITIES.SPEED:                     100 Mb/s
+CAPABILITIES.IS-SOFTWARE:               no
+CAPABILITIES.SRIOV:                     no
+WIRED-PROPERTIES.CARRIER:               off
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: --
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-036.expected b/clients/tests/test-client.check-on-disk/test_003-036.expected
new file mode 100644
index 00000000..11b511f7
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-036.expected
@@ -0,0 +1,42 @@
+location: clients/tests/test-client.py:746:test_003()/36
+cmd: $NMCLI -f ALL dev show eth0
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1510 bytes
+>>>
+GENERAL.DEVICE:                         eth0
+GENERAL.TYPE:                           ethernet
+GENERAL.NM-TYPE:                        NMDeviceEthernet
+GENERAL.VENDOR:                         --
+GENERAL.PRODUCT:                        --
+GENERAL.DRIVER:                         virtual
+GENERAL.DRIVER-VERSION:                 --
+GENERAL.FIRMWARE-VERSION:               --
+GENERAL.HWADDR:                         72:41:AB:90:41:5D
+GENERAL.MTU:                            0
+GENERAL.STATE:                          20 (niedostępne)
+GENERAL.REASON:                         0 (Nie podano przyczyny)
+GENERAL.UDI:                            /sys/devices/virtual/eth0
+GENERAL.IP-IFACE:                       --
+GENERAL.IS-SOFTWARE:                    nie
+GENERAL.NM-MANAGED:                     tak
+GENERAL.AUTOCONNECT:                    tak
+GENERAL.FIRMWARE-MISSING:               nie
+GENERAL.NM-PLUGIN-MISSING:              nie
+GENERAL.PHYS-PORT-ID:                   --
+GENERAL.CONNECTION:                     ethernet
+GENERAL.CON-UUID:                       UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.METERED:                        nieznane
+CAPABILITIES.CARRIER-DETECT:            nie
+CAPABILITIES.SPEED:                     100 Mb/s
+CAPABILITIES.IS-SOFTWARE:               nie
+CAPABILITIES.SRIOV:                     nie
+WIRED-PROPERTIES.CARRIER:               wyłączone
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: --
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-037.expected b/clients/tests/test-client.check-on-disk/test_003-037.expected
new file mode 100644
index 00000000..0346b310
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-037.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:755:test_003()/37
+cmd: $NMCLI -f ALL con
+lang: C
+returncode: 0
+stdout: 1096 bytes
+>>>
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE         ACTIVE-PATH                                         SLAVE 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/3  yes     eth0    deactivating  /org/freedesktop/NetworkManager/ActiveConnection/1  --    
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/1  no      --      --            --                                                  --    
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          never           yes          0                     no        /org/freedesktop/NetworkManager/Settings/Connection/2  no      --      --            --                                                  --    
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-038.expected b/clients/tests/test-client.check-on-disk/test_003-038.expected
new file mode 100644
index 00000000..81c7c237
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-038.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:755:test_003()/38
+cmd: $NMCLI -f ALL con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 1104 bytes
+>>>
+NAME      UUID                                  TYPE      TIMESTAMP  TIMESTAMP-REAL  AUTOCONNECT  AUTOCONNECT-PRIORITY  READONLY  DBUS-PATH                                              ACTIVE  DEVICE  STATE           ACTIVE-PATH                                         SLAVE 
+ethernet  UUID-ethernet-REPLACED-REPLACED-REPL  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/3  tak     eth0    dezaktywowanie  /org/freedesktop/NetworkManager/ActiveConnection/1  --    
+con-1     5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/1  nie     --      --              --                                                  --    
+con-xx1   UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet  0          nigdy           tak          0                     nie       /org/freedesktop/NetworkManager/Settings/Connection/2  nie     --      --              --                                                  --    
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-039.expected b/clients/tests/test-client.check-on-disk/test_003-039.expected
new file mode 100644
index 00000000..3640d0c9
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-039.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:758:test_003()/39
+cmd: $NMCLI -f UUID,TYPE con
+lang: C
+returncode: 0
+stdout: 192 bytes
+>>>
+UUID                                  TYPE     
+UUID-ethernet-REPLACED-REPLACED-REPL  ethernet 
+5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet 
+UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-040.expected b/clients/tests/test-client.check-on-disk/test_003-040.expected
new file mode 100644
index 00000000..fd263f55
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-040.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:758:test_003()/40
+cmd: $NMCLI -f UUID,TYPE con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 192 bytes
+>>>
+UUID                                  TYPE     
+UUID-ethernet-REPLACED-REPLACED-REPL  ethernet 
+5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet 
+UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-041.expected b/clients/tests/test-client.check-on-disk/test_003-041.expected
new file mode 100644
index 00000000..f61fb681
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-041.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:761:test_003()/41
+cmd: $NMCLI -f UUID,TYPE --mode multiline con
+lang: C
+returncode: 0
+stdout: 378 bytes
+>>>
+UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:                                   ethernet
+UUID:                                   5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE:                                   ethernet
+UUID:                                   UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE:                                   ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-042.expected b/clients/tests/test-client.check-on-disk/test_003-042.expected
new file mode 100644
index 00000000..6ea659e9
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-042.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:761:test_003()/42
+cmd: $NMCLI -f UUID,TYPE --mode multiline con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 378 bytes
+>>>
+UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:                                   ethernet
+UUID:                                   5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE:                                   ethernet
+UUID:                                   UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE:                                   ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-043.expected b/clients/tests/test-client.check-on-disk/test_003-043.expected
new file mode 100644
index 00000000..8f5aeb70
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-043.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:764:test_003()/43
+cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con
+lang: C
+returncode: 0
+stdout: 186 bytes
+>>>
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
+UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE:802-3-ethernet
+UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE:802-3-ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-044.expected b/clients/tests/test-client.check-on-disk/test_003-044.expected
new file mode 100644
index 00000000..fbe01dab
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-044.expected
@@ -0,0 +1,18 @@
+location: clients/tests/test-client.py:764:test_003()/44
+cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 186 bytes
+>>>
+UUID:UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:802-3-ethernet
+UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE:802-3-ethernet
+UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE:802-3-ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-045.expected b/clients/tests/test-client.check-on-disk/test_003-045.expected
new file mode 100644
index 00000000..5759e2f4
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-045.expected
@@ -0,0 +1,24 @@
+location: clients/tests/test-client.py:767:test_003()/45
+cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con
+lang: C
+returncode: 0
+stdout: 835 bytes
+>>>
+===============================================================================
+                      NetworkManager connection profiles
+===============================================================================
+UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:                                   ethernet
+-------------------------------------------------------------------------------
+UUID:                                   5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE:                                   ethernet
+-------------------------------------------------------------------------------
+UUID:                                   UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE:                                   ethernet
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-046.expected b/clients/tests/test-client.check-on-disk/test_003-046.expected
new file mode 100644
index 00000000..d853d487
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-046.expected
@@ -0,0 +1,24 @@
+location: clients/tests/test-client.py:767:test_003()/46
+cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 841 bytes
+>>>
+===============================================================================
+                    Profile połączeń usługi NetworkManager
+===============================================================================
+UUID:                                   UUID-ethernet-REPLACED-REPLACED-REPL
+TYPE:                                   ethernet
+-------------------------------------------------------------------------------
+UUID:                                   5fcfd6d7-1e63-3332-8826-a7eda103792d
+TYPE:                                   ethernet
+-------------------------------------------------------------------------------
+UUID:                                   UUID-con-xx1-REPLACED-REPLACED-REPLA
+TYPE:                                   ethernet
+-------------------------------------------------------------------------------
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-047.expected b/clients/tests/test-client.check-on-disk/test_003-047.expected
new file mode 100644
index 00000000..6522c7b2
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-047.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:770:test_003()/47
+cmd: $NMCLI -f UUID,TYPE --mode tabular con
+lang: C
+returncode: 0
+stdout: 192 bytes
+>>>
+UUID                                  TYPE     
+UUID-ethernet-REPLACED-REPLACED-REPL  ethernet 
+5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet 
+UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-048.expected b/clients/tests/test-client.check-on-disk/test_003-048.expected
new file mode 100644
index 00000000..08d3ae95
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-048.expected
@@ -0,0 +1,16 @@
+location: clients/tests/test-client.py:770:test_003()/48
+cmd: $NMCLI -f UUID,TYPE --mode tabular con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 192 bytes
+>>>
+UUID                                  TYPE     
+UUID-ethernet-REPLACED-REPLACED-REPL  ethernet 
+5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet 
+UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-049.expected b/clients/tests/test-client.check-on-disk/test_003-049.expected
new file mode 100644
index 00000000..3f8f3060
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-049.expected
@@ -0,0 +1,15 @@
+location: clients/tests/test-client.py:773:test_003()/49
+cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con
+lang: C
+returncode: 0
+stdout: 156 bytes
+>>>
+UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet
+5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-050.expected b/clients/tests/test-client.check-on-disk/test_003-050.expected
new file mode 100644
index 00000000..dea01fd2
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-050.expected
@@ -0,0 +1,15 @@
+location: clients/tests/test-client.py:773:test_003()/50
+cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 156 bytes
+>>>
+UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet
+5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet
+UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-051.expected b/clients/tests/test-client.check-on-disk/test_003-051.expected
new file mode 100644
index 00000000..7e4dd471
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-051.expected
@@ -0,0 +1,20 @@
+location: clients/tests/test-client.py:776:test_003()/51
+cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con
+lang: C
+returncode: 0
+stdout: 394 bytes
+>>>
+======================================
+  NetworkManager connection profiles
+======================================
+UUID                                  TYPE     
+--------------------------------------------------------------------------------------
+UUID-ethernet-REPLACED-REPLACED-REPL  ethernet 
+5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet 
+UUID-con-xx1-REPLACED-REPLACED-REPLA  ethernet 
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_003-052.expected b/clients/tests/test-client.check-on-disk/test_003-052.expected
new file mode 100644
index 00000000..3d6c2eca
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-052.expected
@@ -0,0 +1,20 @@
+location: clients/tests/test-client.py:776:test_003()/52
+cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 414 bytes
+>>>
+==========================================
+  Profile połączeń usługi NetworkManager
+==========================================
+UUID                                  TYPE     
+------------------------------------------------------------------------------------------
+UUID-ethernet-REPLACED-REPLACED-REPL  ethernet 
+5fcfd6d7-1e63-3332-8826-a7eda103792d  ethernet 
+UUID-con-xx1-REPLACED-REPLACED-REPLA  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
new file mode 100644
index 00000000..dd92ec68
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-053.expected
@@ -0,0 +1,115 @@
+location: clients/tests/test-client.py:779:test_003()/53
+cmd: $NMCLI con s ethernet
+lang: C
+returncode: 0
+stdout: 4848 bytes
+>>>
+connection.id:                          ethernet
+connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:                   --
+connection.type:                        802-3-ethernet
+connection.interface-name:              --
+connection.autoconnect:                 yes
+connection.autoconnect-priority:        0
+connection.autoconnect-retries:         -1 (default)
+connection.auth-retries:                -1
+connection.timestamp:                   0
+connection.read-only:                   no
+connection.permissions:                 --
+connection.zone:                        --
+connection.master:                      --
+connection.slave-type:                  --
+connection.autoconnect-slaves:          -1 (default)
+connection.secondaries:                 --
+connection.gateway-ping-timeout:        0
+connection.metered:                     unknown
+connection.lldp:                        default
+connection.mdns:                        -1 (default)
+802-3-ethernet.port:                    --
+802-3-ethernet.speed:                   0
+802-3-ethernet.duplex:                  --
+802-3-ethernet.auto-negotiate:          no
+802-3-ethernet.mac-address:             --
+802-3-ethernet.cloned-mac-address:      --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist:   --
+802-3-ethernet.mtu:                     auto
+802-3-ethernet.s390-subchannels:        --
+802-3-ethernet.s390-nettype:            --
+802-3-ethernet.s390-options:            --
+802-3-ethernet.wake-on-lan:             default
+802-3-ethernet.wake-on-lan-password:    --
+ipv4.method:                            auto
+ipv4.dns:                               --
+ipv4.dns-search:                        --
+ipv4.dns-options:                       ""
+ipv4.dns-priority:                      0
+ipv4.addresses:                         --
+ipv4.gateway:                           --
+ipv4.routes:                            --
+ipv4.route-metric:                      -1
+ipv4.route-table:                       0 (unspec)
+ipv4.ignore-auto-routes:                no
+ipv4.ignore-auto-dns:                   no
+ipv4.dhcp-client-id:                    --
+ipv4.dhcp-timeout:                      0 (default)
+ipv4.dhcp-send-hostname:                yes
+ipv4.dhcp-hostname:                     --
+ipv4.dhcp-fqdn:                         --
+ipv4.never-default:                     no
+ipv4.may-fail:                          yes
+ipv4.dad-timeout:                       -1 (default)
+ipv6.method:                            auto
+ipv6.dns:                               --
+ipv6.dns-search:                        --
+ipv6.dns-options:                       ""
+ipv6.dns-priority:                      0
+ipv6.addresses:                         --
+ipv6.gateway:                           --
+ipv6.routes:                            --
+ipv6.route-metric:                      -1
+ipv6.route-table:                       0 (unspec)
+ipv6.ignore-auto-routes:                no
+ipv6.ignore-auto-dns:                   no
+ipv6.never-default:                     no
+ipv6.may-fail:                          yes
+ipv6.ip6-privacy:                       -1 (unknown)
+ipv6.addr-gen-mode:                     stable-privacy
+ipv6.dhcp-send-hostname:                yes
+ipv6.dhcp-hostname:                     --
+ipv6.token:                             --
+proxy.method:                           none
+proxy.browser-only:                     no
+proxy.pac-url:                          --
+proxy.pac-script:                       --
+GENERAL.NAME:                           ethernet
+GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:                        eth0
+GENERAL.STATE:                          deactivating
+GENERAL.DEFAULT:                        no
+GENERAL.DEFAULT6:                       no
+GENERAL.SPEC-OBJECT:                    --
+GENERAL.VPN:                            no
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:                           --
+GENERAL.MASTER-PATH:                    --
+
+GENERAL.NAME:                           ethernet
+GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:                        eth1
+GENERAL.STATE:                          activated
+GENERAL.DEFAULT:                        no
+GENERAL.DEFAULT6:                       no
+GENERAL.SPEC-OBJECT:                    --
+GENERAL.VPN:                            no
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:                           --
+GENERAL.MASTER-PATH:                    --
+
+<<<
+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
new file mode 100644
index 00000000..7379f872
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_003-054.expected
@@ -0,0 +1,115 @@
+location: clients/tests/test-client.py:779:test_003()/54
+cmd: $NMCLI con s ethernet
+lang: pl_PL.UTF-8
+returncode: 0
+stdout: 4872 bytes
+>>>
+connection.id:                          ethernet
+connection.uuid:                        UUID-ethernet-REPLACED-REPLACED-REPL
+connection.stable-id:                   --
+connection.type:                        802-3-ethernet
+connection.interface-name:              --
+connection.autoconnect:                 tak
+connection.autoconnect-priority:        0
+connection.autoconnect-retries:         -1 (default)
+connection.auth-retries:                -1
+connection.timestamp:                   0
+connection.read-only:                   nie
+connection.permissions:                 --
+connection.zone:                        --
+connection.master:                      --
+connection.slave-type:                  --
+connection.autoconnect-slaves:          -1 (default)
+connection.secondaries:                 --
+connection.gateway-ping-timeout:        0
+connection.metered:                     nieznane
+connection.lldp:                        default
+connection.mdns:                        -1 (default)
+802-3-ethernet.port:                    --
+802-3-ethernet.speed:                   0
+802-3-ethernet.duplex:                  --
+802-3-ethernet.auto-negotiate:          nie
+802-3-ethernet.mac-address:             --
+802-3-ethernet.cloned-mac-address:      --
+802-3-ethernet.generate-mac-address-mask:--
+802-3-ethernet.mac-address-blacklist:   --
+802-3-ethernet.mtu:                     automatyczne
+802-3-ethernet.s390-subchannels:        --
+802-3-ethernet.s390-nettype:            --
+802-3-ethernet.s390-options:            --
+802-3-ethernet.wake-on-lan:             default
+802-3-ethernet.wake-on-lan-password:    --
+ipv4.method:                            auto
+ipv4.dns:                               --
+ipv4.dns-search:                        --
+ipv4.dns-options:                       ""
+ipv4.dns-priority:                      0
+ipv4.addresses:                         --
+ipv4.gateway:                           --
+ipv4.routes:                            --
+ipv4.route-metric:                      -1
+ipv4.route-table:                       0 (unspec)
+ipv4.ignore-auto-routes:                nie
+ipv4.ignore-auto-dns:                   nie
+ipv4.dhcp-client-id:                    --
+ipv4.dhcp-timeout:                      0 (default)
+ipv4.dhcp-send-hostname:                tak
+ipv4.dhcp-hostname:                     --
+ipv4.dhcp-fqdn:                         --
+ipv4.never-default:                     nie
+ipv4.may-fail:                          tak
+ipv4.dad-timeout:                       -1 (default)
+ipv6.method:                            auto
+ipv6.dns:                               --
+ipv6.dns-search:                        --
+ipv6.dns-options:                       ""
+ipv6.dns-priority:                      0
+ipv6.addresses:                         --
+ipv6.gateway:                           --
+ipv6.routes:                            --
+ipv6.route-metric:                      -1
+ipv6.route-table:                       0 (unspec)
+ipv6.ignore-auto-routes:                nie
+ipv6.ignore-auto-dns:                   nie
+ipv6.never-default:                     nie
+ipv6.may-fail:                          tak
+ipv6.ip6-privacy:                       -1 (unknown)
+ipv6.addr-gen-mode:                     stable-privacy
+ipv6.dhcp-send-hostname:                tak
+ipv6.dhcp-hostname:                     --
+ipv6.token:                             --
+proxy.method:                           none
+proxy.browser-only:                     nie
+proxy.pac-url:                          --
+proxy.pac-script:                       --
+GENERAL.NAME:                           ethernet
+GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:                        eth0
+GENERAL.STATE:                          deactivating
+GENERAL.DEFAULT:                        nie
+GENERAL.DEFAULT6:                       nie
+GENERAL.SPEC-OBJECT:                    --
+GENERAL.VPN:                            nie
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/1
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:                           --
+GENERAL.MASTER-PATH:                    --
+
+GENERAL.NAME:                           ethernet
+GENERAL.UUID:                           UUID-ethernet-REPLACED-REPLACED-REPL
+GENERAL.DEVICES:                        eth1
+GENERAL.STATE:                          activated
+GENERAL.DEFAULT:                        nie
+GENERAL.DEFAULT6:                       nie
+GENERAL.SPEC-OBJECT:                    --
+GENERAL.VPN:                            nie
+GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
+GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/Connection/3
+GENERAL.ZONE:                           --
+GENERAL.MASTER-PATH:                    --
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-001.expected b/clients/tests/test-client.check-on-disk/test_004-001.expected
new file mode 100644
index 00000000..0723731d
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-001.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:789:test_004()/1
+cmd: $NMCLI c add type wifi ifname '*' ssid foobar con-name con-xx1
+lang: C
+returncode: 0
+stdout: 80 bytes
+>>>
+Connection 'con-xx1' (UUID-con-xx1-REPLACED-REPLACED-REPLA) successfully added.
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-002.expected b/clients/tests/test-client.check-on-disk/test_004-002.expected
new file mode 100644
index 00000000..37c88812
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-002.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:791:test_004()/2
+cmd: $NMCLI connection mod con-xx1 ip.gateway ''
+lang: C
+returncode: 2
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 75 bytes
+>>>
+Error: invalid or not allowed setting 'ip': 'ip' is ambiguous: ipv4, ipv6.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-003.expected b/clients/tests/test-client.check-on-disk/test_004-003.expected
new file mode 100644
index 00000000..e76bb0bf
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-003.expected
@@ -0,0 +1,12 @@
+location: clients/tests/test-client.py:792:test_004()/3
+cmd: $NMCLI connection mod con-xx1 ipv4.gateway 172.16.0.1
+lang: C
+returncode: 0
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-004.expected b/clients/tests/test-client.check-on-disk/test_004-004.expected
new file mode 100644
index 00000000..17233cd1
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-004.expected
@@ -0,0 +1,12 @@
+location: clients/tests/test-client.py:793:test_004()/4
+cmd: $NMCLI connection mod con-xx1 ipv6.gateway ::99
+lang: C
+returncode: 0
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-005.expected b/clients/tests/test-client.check-on-disk/test_004-005.expected
new file mode 100644
index 00000000..a4b0a592
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-005.expected
@@ -0,0 +1,13 @@
+location: clients/tests/test-client.py:794:test_004()/5
+cmd: $NMCLI connection mod con-xx1 802.abc ''
+lang: C
+returncode: 2
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 116 bytes
+>>>
+Error: invalid or not allowed setting '802': '802' is ambiguous: 802-11-wireless, 802-11-wireless-security, 802-1x.
+
+<<<
diff --git a/clients/tests/test-client.check-on-disk/test_004-006.expected b/clients/tests/test-client.check-on-disk/test_004-006.expected
new file mode 100644
index 00000000..9fd5fe42
--- /dev/null
+++ b/clients/tests/test-client.check-on-disk/test_004-006.expected
@@ -0,0 +1,12 @@
+location: clients/tests/test-client.py:795:test_004()/6
+cmd: $NMCLI connection mod con-xx1 802-11-wireless.band a
+lang: C
+returncode: 0
+stdout: 0 bytes
+>>>
+
+<<<
+stderr: 0 bytes
+>>>
+
+<<<
diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py
new file mode 100755
index 00000000..a8e107a0
--- /dev/null
+++ b/clients/tests/test-client.py
@@ -0,0 +1,856 @@
+#!/usr/bin/env python
+
+from __future__ import print_function
+
+import sys
+
+try:
+    import gi
+    from gi.repository import GLib
+
+    gi.require_version('NM', '1.0')
+    from gi.repository import NM
+except Exception as e:
+    GLib = None
+    NM = None
+
+import os
+import errno
+import unittest
+import socket
+import itertools
+import subprocess
+import shlex
+import re
+import dbus
+import time
+import dbus.service
+import dbus.mainloop.glib
+
+# The test can be configured via the following environment variables:
+ENV_NM_TEST_CLIENT_BUILDDIR   = 'NM_TEST_CLIENT_BUILDDIR'
+ENV_NM_TEST_CLIENT_NMCLI_PATH = 'NM_TEST_CLIENT_NMCLI_PATH'
+ENV_NM_TEST_CLIENT_CHECK_L10N = 'NM_TEST_CLIENT_CHECK_L10N'
+ENV_NM_TEST_REGENERATE        = 'NM_TEST_REGENERATE'
+
+###############################################################################
+
+class PathConfiguration:
+
+    @staticmethod
+    def srcdir():
+        # this is the directory where the test script itself lies.
+        # Based on this directory, we find other parts that we expect
+        # in the source repository.
+        return os.path.dirname(os.path.abspath(__file__))
+
+    @staticmethod
+    def top_srcdir():
+        return os.path.abspath(PathConfiguration.srcdir() + "/../..")
+
+    @staticmethod
+    def test_networkmanager_service_path():
+        v = os.path.abspath(PathConfiguration.top_srcdir() + "/tools/test-networkmanager-service.py")
+        assert os.path.exists(v), ("Cannot find test server at \"%s\"" % (v))
+        return v
+
+###############################################################################
+
+os.sys.path.append(os.path.abspath(PathConfiguration.top_srcdir() + '/examples/python'))
+import nmex
+
+dbus_session_inited = False
+
+_DEFAULT_ARG = object()
+
+###############################################################################
+
+class Util:
+
+    @staticmethod
+    def python_has_version(major, minor = 0):
+        return    sys.version_info[0] > major \
+               or (    sys.version_info[0] == major \
+                   and sys.version_info[1] >= minor)
+
+    @staticmethod
+    def is_string(s):
+        if Util.python_has_version(3):
+            t = str
+        else:
+            t = basestring
+        return isinstance(s, t)
+
+    _find_unsafe = re.compile(r'[^\w@%+=:,./-]',
+                              re.ASCII if sys.version_info[0] >= 3 else 0).search
+
+    @staticmethod
+    def quote(s):
+        if Util.python_has_version(3, 3):
+            return shlex.quote(s)
+        if not s:
+            return "''"
+        if Util._find_unsafe(s) is None:
+            return s
+        return "'" + s.replace("'", "'\"'\"'") + "'"
+
+    @staticmethod
+    def popen_wait(p, timeout = None):
+        # wait() has a timeout argument only since 3.3
+        if Util.python_has_version(3, 3):
+            return p.wait(timeout)
+        if timeout is None:
+            return p.wait()
+        start = nmex.nm_boot_time_ns()
+        while True:
+            if p.poll() is not None:
+                return p.returncode
+            if start + (timeout * 1000000000) < nmex.nm_boot_time_ns():
+                raise Exception("timeout expired")
+            time.sleep(0.05)
+
+    @staticmethod
+    def iter_single(itr, min_num = 1, max_num = 1):
+        itr = list(itr)
+        n = 0
+        v = None
+        for c in itr:
+            n += 1
+            if n > 1:
+                break
+            v = c
+        if n < min_num:
+            raise AssertionError("Expected at least %s elements, but %s found" % (min_num, n))
+        if n > max_num:
+            raise AssertionError("Expected at most %s elements, but %s found" % (max_num, n))
+        return v
+
+    @staticmethod
+    def file_read(filename):
+        try:
+            with open(filename, 'rb') as f:
+                return f.read()
+        except:
+            return None
+
+    @staticmethod
+    def replace_text(text, replace_arr):
+        if not replace_arr:
+            return text
+        text = [text]
+        for replace in replace_arr:
+            try:
+                v_search = replace[0]()
+            except TypeError:
+                v_search = replace[0]
+            assert v_search is None or Util.is_string(v_search)
+            if not v_search:
+                continue
+            v_replace = replace[1]
+            v_search = v_search.encode('utf-8')
+            v_replace = v_replace.encode('utf-8')
+            text2 = []
+            for t in text:
+                if isinstance(t, tuple):
+                    text2.append(t)
+                    continue
+                t2 = t.split(v_search)
+                text2.append(t2[0])
+                for t3 in t2[1:]:
+                    text2.append( (v_replace,) )
+                    text2.append(t3)
+            text = text2
+        return b''.join([(t[0] if isinstance(t, tuple) else t) for t in text])
+
+###############################################################################
+
+class Configuration:
+
+    def __init__(self):
+        self._values = {}
+
+    def get(self, name):
+        v = self._values.get(name, None)
+        if name in self._values:
+            return v
+        if name == ENV_NM_TEST_CLIENT_BUILDDIR:
+            v = os.environ.get(ENV_NM_TEST_CLIENT_BUILDDIR, PathConfiguration.top_srcdir())
+            if not os.path.isdir(v):
+                raise Exception("Missing builddir. Set NM_TEST_CLIENT_BUILDDIR?")
+        elif name == ENV_NM_TEST_CLIENT_NMCLI_PATH:
+            v = os.environ.get(ENV_NM_TEST_CLIENT_NMCLI_PATH, None)
+            if v is None:
+                try:
+                    v = os.path.abspath(self.get(ENV_NM_TEST_CLIENT_BUILDDIR) + "/clients/cli/nmcli")
+                except:
+                    pass
+            if not os.path.exists(v):
+                raise Exception("Missing nmcli binary. Set NM_TEST_CLIENT_NMCLI_PATH?")
+        elif name == ENV_NM_TEST_CLIENT_CHECK_L10N:
+            # if we test locales other than 'C', the output of nmcli depends on whether
+            # nmcli can load the translations. Unfortunately, I cannot find a way to
+            # make gettext use the po/*.gmo files from the build-dir.
+            #
+            # hence, such tests only work, if you also issue `make-install`
+            #
+            # Only by setting NM_TEST_CLIENT_CHECK_L10N=1, these tests are included
+            # as well.
+            v = (os.environ.get(ENV_NM_TEST_CLIENT_CHECK_L10N, '0') == '1')
+        elif name == ENV_NM_TEST_REGENERATE:
+            # in the "regenerate" mode, the tests will rewrite the files on disk against
+            # which we assert. That is useful, if there are intentional changes and
+            # we want to regenerate the expected output.
+            v = (os.environ.get(ENV_NM_TEST_REGENERATE, '0') == '1')
+        else:
+            raise Exception()
+        self._values[name] = v
+        return v
+
+conf = Configuration()
+
+###############################################################################
+
+class NMStubServer:
+
+    @staticmethod
+    def _conn_get_main_object(conn):
+        try:
+            return conn.get_object('org.freedesktop.NetworkManager', '/org/freedesktop/NetworkManager')
+        except:
+            return None
+
+    def __init__(self):
+        service_path = PathConfiguration.test_networkmanager_service_path()
+        self._conn = dbus.SessionBus()
+        p = subprocess.Popen([sys.executable, service_path],
+                             stdin = subprocess.PIPE)
+
+        start = nmex.nm_boot_time_ns()
+        while True:
+            if p.poll() is not None:
+                p.stdin.close()
+                if p.returncode == 77:
+                    raise unittest.SkipTest('the stub service %s exited with status 77' % (service_path))
+                raise Exception('the stub service %s exited unexpectedly' % (service_path))
+            nmobj = self._conn_get_main_object(self._conn)
+            if nmobj is not None:
+                break
+            if (nmex.nm_boot_time_ns() - start) / 1000000 >= 2000:
+                p.stdin.close()
+                p.kill()
+                Util.popen_wait(p, 1000)
+                raise Exception("after starting stub service the D-Bus name was not claimed in time")
+
+        self._nmobj = nmobj
+        self._nmiface = dbus.Interface(nmobj, "org.freedesktop.NetworkManager.LibnmGlibTest")
+        self._p = p
+
+    def shutdown(self):
+        self._nmobj = None
+        self._nmiface = None
+        self._conn = None
+        self._p.stdin.close()
+        self._p.kill()
+        Util.popen_wait(self._p, 1000)
+        self._p = None
+        if self._conn_get_main_object(self._conn) is not None:
+            raise Exception("Stub service is not still here although it should shut down")
+
+    class _MethodProxy:
+        def __init__(self, parent, method_name):
+            self._parent = parent
+            self._method_name = method_name
+        def __call__(self, *args, **kwargs):
+            dbus_iface = kwargs.pop('dbus_iface', None)
+            if dbus_iface is None:
+                dbus_iface = self._parent._nmiface
+            method = dbus_iface.get_dbus_method(self._method_name)
+            if kwargs:
+                # for convenience, we allow the caller to specify arguments
+                # as kwargs. In this case, we construct a a{sv} array as last argument.
+                kwargs2 = {}
+                args = list(args)
+                args.append(kwargs2)
+                for k in kwargs.keys():
+                    kwargs2[k] = kwargs[k]
+            return method(*args)
+
+    def __getattr__(self, member):
+        if not member.startswith("op_"):
+            raise AttributeError(member)
+        return self._MethodProxy(self, member[3:])
+
+    def addConnection(self, connection, verify_connection = True):
+        return self.op_AddConnection(connection, verify_connection)
+
+    def findConnectionUuid(self, con_id):
+        try:
+            u = Util.iter_single(self.op_FindConnections(con_id = con_id))[1]
+            assert u, ("Invalid uuid %s" % (u))
+        except Exception as e:
+            raise AssertionError("Unexpectedly not found connection %s: %s" % (con_id, str(e)))
+        return u
+
+    def setProperty(self, path, propname, value, iface_name = None):
+        if iface_name is None:
+            iface_name = ''
+        self.op_SetProperties([
+            (path, [
+                (iface_name, [
+                    (propname, value),
+                ]),
+            ]),
+        ])
+
+###############################################################################
+
+class AsyncProcess():
+
+    def __init__(self,
+                 args,
+                 env,
+                 complete_cb):
+        self._args = args
+        self._env = env
+        self._complete_cb = complete_cb
+
+    def start(self):
+        if not hasattr(self, '_p'):
+            self._p = subprocess.Popen(self._args,
+                                       stdout = subprocess.PIPE,
+                                       stderr = subprocess.PIPE,
+                                       env = self._env)
+
+    def wait(self):
+
+        self.start()
+
+        Util.popen_wait(self._p, 2000)
+
+        (returncode, stdout, stderr) = (self._p.returncode, self._p.stdout.read(), self._p.stderr.read())
+
+        self._p.stdout.close()
+        self._p.stderr.close()
+        self._p = None
+
+        self._complete_cb(self, returncode, stdout, stderr)
+
+###############################################################################
+
+file_list = []
+
+class NmTestBase(unittest.TestCase):
+    pass
+
+class TestNmcli(NmTestBase):
+
+    def call_nmcli_l(self,
+                     args,
+                     check_on_disk = _DEFAULT_ARG,
+                     expected_returncode = _DEFAULT_ARG,
+                     expected_stdout = _DEFAULT_ARG,
+                     expected_stderr = _DEFAULT_ARG,
+                     replace_stdout = None,
+                     replace_stderr = None,
+                     sort_lines_stdout = False,
+                     extra_env = None,
+                     sync_barrier = False):
+        frame = sys._getframe(1)
+        for lang in [ 'C', 'pl' ]:
+            self._call_nmcli(args,
+                             lang,
+                             check_on_disk,
+                             expected_returncode,
+                             expected_stdout,
+                             expected_stderr,
+                             replace_stdout,
+                             replace_stderr,
+                             sort_lines_stdout,
+                             extra_env,
+                             sync_barrier,
+                             frame)
+
+
+    def call_nmcli(self,
+                   args,
+                   langs = None,
+                   lang = None,
+                   check_on_disk = _DEFAULT_ARG,
+                   expected_returncode = _DEFAULT_ARG,
+                   expected_stdout = _DEFAULT_ARG,
+                   expected_stderr = _DEFAULT_ARG,
+                   replace_stdout = None,
+                   replace_stderr = None,
+                   sort_lines_stdout = False,
+                   extra_env = None,
+                   sync_barrier = None):
+
+        frame = sys._getframe(1)
+
+        if langs is not None:
+            assert lang is None
+        else:
+            if lang is None:
+                lang = 'C'
+            langs = [lang]
+
+        if sync_barrier is None:
+            sync_barrier = (len(langs) == 1)
+
+        for lang in langs:
+            self._call_nmcli(args,
+                             lang,
+                             check_on_disk,
+                             expected_returncode,
+                             expected_stdout,
+                             expected_stderr,
+                             replace_stdout,
+                             replace_stderr,
+                             sort_lines_stdout,
+                             extra_env,
+                             sync_barrier,
+                             frame)
+
+    def _call_nmcli(self,
+                    args,
+                    lang,
+                    check_on_disk,
+                    expected_returncode,
+                    expected_stdout,
+                    expected_stderr,
+                    replace_stdout,
+                    replace_stderr,
+                    sort_lines_stdout,
+                    extra_env,
+                    sync_barrier,
+                    frame):
+
+        if sync_barrier:
+            self.async_wait()
+
+        calling_fcn = frame.f_code.co_name
+        calling_num = self._calling_num.get(calling_fcn, 0) + 1
+        self._calling_num[calling_fcn] = calling_num
+
+        test_name = '%s-%03d' % (calling_fcn, calling_num)
+
+        # we cannot use frame.f_code.co_filename directly, because it might be different depending
+        # on where the file lies and which is CWD. We still want to give the location of
+        # the file, so that the user can easier find the source (when looking at the .expected files)
+        script_filename = 'clients/tests/test-client.py'
+        self.assertTrue(os.path.abspath(frame.f_code.co_filename).endswith(script_filename))
+
+        calling_location = '%s:%d:%s()/%d' % (script_filename, frame.f_lineno, frame.f_code.co_name, calling_num)
+
+        if lang is None or lang == 'C':
+            lang = 'C'
+            language = ''
+        elif lang is 'de':
+            lang = 'de_DE.utf8'
+            language = 'de'
+        elif lang is 'pl':
+            lang = 'pl_PL.UTF-8'
+            language = 'pl'
+        else:
+            self.fail('invalid language %s' % (lang))
+
+        env = {}
+        if extra_env is not None:
+            for k, v in extra_env.items():
+                env[k] = v
+        for k in ['LD_LIBRARY_PATH',
+                  'DBUS_SESSION_BUS_ADDRESS']:
+            val = os.environ.get(k, None)
+            if val is not None:
+                env[k] = val
+        env['LANG'] = lang
+        env['LANGUAGE'] = language
+        env['LIBNM_USE_SESSION_BUS'] = '1'
+        env['LIBNM_USE_NO_UDEV'] = '1'
+        env['TERM'] = 'linux'
+
+        args = [conf.get(ENV_NM_TEST_CLIENT_NMCLI_PATH)] + list(args)
+
+        if replace_stdout is not None:
+            replace_stdout = list(replace_stdout)
+        if replace_stderr is not None:
+            replace_stderr = list(replace_stderr)
+
+        if check_on_disk is _DEFAULT_ARG:
+            check_on_disk = (    expected_returncode is _DEFAULT_ARG
+                             and expected_stdout is _DEFAULT_ARG
+                             and expected_stderr is _DEFAULT_ARG)
+        if expected_returncode is _DEFAULT_ARG:
+            expected_returncode = None
+        if expected_stdout is _DEFAULT_ARG:
+            expected_stdout = None
+        if expected_stderr is _DEFAULT_ARG:
+            expected_stderr = None
+
+        def complete_cb(async_job,
+                        returncode,
+                        stdout,
+                        stderr):
+
+            stdout = Util.replace_text(stdout, replace_stdout)
+            stderr = Util.replace_text(stderr, replace_stderr)
+
+            if sort_lines_stdout:
+                stdout = b'\n'.join(sorted(stdout.split(b'\n')))
+
+            ignore_l10n_diff = (    lang != 'C'
+                                and not conf.get(ENV_NM_TEST_CLIENT_CHECK_L10N))
+
+            if expected_stderr is not None:
+                if expected_stderr != stderr:
+                    if ignore_l10n_diff:
+                        self._skip_test_for_l10n_diff.append(test_name)
+                    else:
+                        self.assertEqual(expected_stderr, stderr)
+            if expected_stdout is not None:
+                if expected_stdout != stdout:
+                    if ignore_l10n_diff:
+                        self._skip_test_for_l10n_diff.append(test_name)
+                    else:
+                        self.assertEqual(expected_stdout, stdout)
+            if expected_returncode is not None:
+                self.assertEqual(expected_returncode, returncode)
+
+            dirname = PathConfiguration.srcdir() + '/test-client.check-on-disk'
+            basename = test_name + '.expected'
+            filename = os.path.abspath(dirname + '/' + basename)
+
+            if not check_on_disk:
+                if os.path.exists(filename):
+                    self.fail("The file '%s' exists, although we expect it not to." % (filename))
+                return
+
+            file_list.append(basename)
+
+            content_old = Util.file_read(filename)
+
+            content_new = ('location: %s\n' % (calling_location)).encode('utf8') + \
+                          ('cmd: $NMCLI %s\n' % (' '.join([Util.quote(a) for a in args[1:]]))).encode('utf8') + \
+                          ('lang: %s\n' % (lang)).encode('utf8') + \
+                          ('returncode: %d\n' % (returncode)).encode('utf8') + \
+                          ('stdout: %d bytes\n>>>\n' % (len(stdout))).encode('utf8') + \
+                          stdout + \
+                          ('\n<<<\nstderr: %d bytes\n>>>\n' % (len(stderr))).encode('utf8') + \
+                          stderr + \
+                          '\n<<<\n'.encode('utf8')
+
+            w = conf.get(ENV_NM_TEST_REGENERATE)
+
+            if content_old is not None:
+                if content_old == content_new:
+                    return
+
+                if not w:
+                    if ignore_l10n_diff:
+                        self._skip_test_for_l10n_diff.append(test_name)
+                        return
+                    print("\n\n\nThe file '%s' does not have the expected content:" % (filename))
+                    print("ACTUAL OUTPUT:\n[[%s]]\n" % (content_new))
+                    print("EXPECT OUTPUT:\n[[%s]]\n" % (content_old))
+                    print("Let the test write the file by rerunning with NM_TEST_REGENERATE=1\n\n")
+                    raise AssertionError("Unexpected output of command, expected %s. Rerun test with NM_TEST_REGENERATE=1 to regenerate files" % (filename))
+            else:
+                if not w:
+                    self.fail("The file '%s' does not exist. Let the test write the file by rerunning with NM_TEST_REGENERATE=1" % (filename))
+
+            try:
+                if not os.path.exists(dirname):
+                    os.makedirs(dirname)
+                with open(filename, 'wb') as content_file:
+                    content_file.write(content_new)
+            except Exception as e:
+                self.fail("Failure to write '%s': %s" % (filename, e))
+
+        async_job = AsyncProcess(args = args,
+                                 env = env,
+                                 complete_cb = complete_cb)
+
+        self._async_jobs.append(async_job)
+
+        if sync_barrier:
+            self.async_wait()
+        else:
+            self.async_start()
+
+    def async_start(self):
+        # limit number parallel running jobs
+        for async_job in self._async_jobs[0:10]:
+            async_job.start()
+
+    def async_wait(self):
+        while self._async_jobs:
+            self.async_start()
+            self._async_jobs.pop(0).wait()
+
+    def setUp(self):
+        if not dbus_session_inited:
+            self.skipTest("Own D-Bus session for testing is not initialized. Do you have dbus-run-session available?")
+        if NM is None:
+            self.skipTest("gi.NM is not available. Did you build with introspection?")
+        self.srv = NMStubServer()
+        self._calling_num = {}
+        self._skip_test_for_l10n_diff = []
+        self._async_jobs = []
+
+    def tearDown(self):
+        self.async_wait()
+        self.srv.shutdown()
+        self.srv = None
+        self._calling_num = None
+        if self._skip_test_for_l10n_diff:
+            # nmcli loads translations from the installation path. This failure commonly
+            # happens because you did not install the binary in the --prefix, before
+            # running the test. Hence, translations are not available or differ.
+            msg = "Skipped asserting for localized tests %s. Set NM_TEST_CLIENT_CHECK_L10N=1 to force fail." % (','.join(self._skip_test_for_l10n_diff))
+            if Util.python_has_version(3):
+                # python2 does not suppot skipping the test during tearDown()
+                self.skipTest(msg)
+            print(msg + "\n")
+        self._skip_test_for_l10n_diff = None
+
+    def init_001(self):
+        self.srv.op_AddObj('WiredDevice',
+                           iface = 'eth0')
+        self.srv.op_AddObj('WiredDevice',
+                           iface = 'eth1')
+        self.srv.op_AddObj('WifiDevice',
+                           iface = 'wlan0')
+        self.srv.op_AddObj('WifiDevice',
+                           iface = 'wlan1')
+
+        # add another device with an identical ifname. The D-Bus API itself
+        # does not enforce the ifnames are unique.
+        self.srv.op_AddObj('WifiDevice',
+                           ident = 'wlan1/x',
+                           iface = 'wlan1')
+
+        self.srv.op_AddObj('WifiAp',
+                           device = 'wlan0')
+        self.srv.op_AddObj('WifiAp',
+                           device = 'wlan0')
+        self.srv.op_AddObj('WifiAp',
+                           device = 'wlan0')
+
+        self.srv.op_AddObj('WifiAp',
+                           device = 'wlan1')
+
+        self.srv.addConnection( {
+                                    'connection': {
+                                        'type': '802-3-ethernet',
+                                        'id':   'con-1',
+                                    },
+                                })
+
+    def test_001(self):
+
+        self.call_nmcli_l([])
+
+        self.call_nmcli_l(['-f', 'AP', '-mode', 'multiline', '-p', 'd', 'show', 'wlan0'])
+
+        self.call_nmcli_l(['c', 's'])
+
+        self.call_nmcli_l(['bogus', 's'])
+
+        for mode in [[],
+                     ['--mode', 'tabular'],
+                     ['--mode', 'multiline']]:
+            for fmt in [[],
+                        ['--pretty'],
+                        ['--terse']]:
+                self.call_nmcli_l(mode + fmt + ['general', 'permissions'])
+
+    def test_002(self):
+        self.init_001()
+
+        self.call_nmcli_l(['d'])
+
+        self.call_nmcli_l(['-f', 'all', 'd'])
+
+        self.call_nmcli_l([])
+
+        self.call_nmcli_l(['-f', 'AP', '-mode', 'multiline',       'd', 'show', 'wlan0'])
+        self.call_nmcli_l(['-f', 'AP', '-mode', 'multiline', '-p', 'd', 'show', 'wlan0'])
+        self.call_nmcli_l(['-f', 'AP', '-mode', 'multiline', '-t', 'd', 'show', 'wlan0'])
+        self.call_nmcli_l(['-f', 'AP', '-mode', 'tabular',         'd', 'show', 'wlan0'])
+        self.call_nmcli_l(['-f', 'AP', '-mode', 'tabular',   '-p', 'd', 'show', 'wlan0'])
+        self.call_nmcli_l(['-f', 'AP', '-mode', 'tabular',   '-t', 'd', 'show', 'wlan0'])
+
+        self.call_nmcli_l(['-f', 'ALL', 'd', 'wifi'])
+
+        self.call_nmcli_l(['c'])
+
+        self.call_nmcli_l(['c', 's', 'con-1'])
+
+    def test_003(self):
+        self.init_001()
+
+        replace_stdout = []
+
+        replace_stdout.append((lambda: self.srv.findConnectionUuid('con-xx1'), 'UUID-con-xx1-REPLACED-REPLACED-REPLA'))
+
+        self.call_nmcli(['c', 'add', 'type', 'ethernet', 'ifname', '*', 'con-name', 'con-xx1'],
+                        replace_stdout = replace_stdout)
+
+        self.call_nmcli_l(['c', 's'],
+                          replace_stdout = replace_stdout)
+
+        replace_stdout.append((lambda: self.srv.findConnectionUuid('ethernet'), 'UUID-ethernet-REPLACED-REPLACED-REPL'))
+
+        self.call_nmcli(['c', 'add', 'type', 'ethernet', 'ifname', '*'],
+                        replace_stdout = replace_stdout)
+
+        self.call_nmcli_l(['c', 's'],
+                          replace_stdout = replace_stdout)
+
+        self.call_nmcli_l(['-f', 'ALL', 'c', 's'],
+                          replace_stdout = replace_stdout)
+
+        self.call_nmcli_l(['--complete-args', '-f', 'ALL', 'c', 's', ''],
+                          replace_stdout = replace_stdout,
+                          sort_lines_stdout = True)
+
+        # activate the same profile on multiple devices. Our stub-implmentation
+        # is fine with that... although NetworkManager service would reject
+        # such a configuration by deactivating the profile first. But note that
+        # that is only an internal behavior of NetworkManager service. The D-Bus
+        # API perfectly allows for one profile to be active multiple times. Also
+        # note, that there is always a short time where one profile goes down,
+        # while another is activating. Hence, while real NetworkManager commonly
+        # does not allow that multiple profiles *stay* connected at the same
+        # time, there is always the possibility that a profile is activating/active
+        # on a device, while also activating/deactivating in parallel.
+        for dev in ['eth0', 'eth1']:
+            self.call_nmcli(['con', 'up', 'ethernet', 'ifname', dev])
+
+            self.call_nmcli_l(['con'],
+                              replace_stdout = replace_stdout)
+
+            self.call_nmcli_l(['-f', 'ALL', 'con'],
+                              replace_stdout = replace_stdout)
+
+            self.call_nmcli_l(['-f', 'ALL', 'con', 's', 'ethernet'],
+                              replace_stdout = replace_stdout)
+
+            self.call_nmcli_l(['con', 's', 'ethernet'],
+                              replace_stdout = replace_stdout)
+
+            self.call_nmcli_l(['-f', 'ALL', 'dev', 's', 'eth0'],
+                              replace_stdout = replace_stdout)
+
+            self.call_nmcli_l(['-f', 'ALL', 'dev', 'show', 'eth0'],
+                              replace_stdout = replace_stdout)
+
+        self.async_wait()
+
+        self.srv.setProperty('/org/freedesktop/NetworkManager/ActiveConnection/1',
+                             'State',
+                             dbus.UInt32(NM.ActiveConnectionState.DEACTIVATING))
+
+        self.call_nmcli_l(['-f', 'ALL', 'con'],
+                          replace_stdout = replace_stdout)
+
+        self.call_nmcli_l(['-f', 'UUID,TYPE', 'con'],
+                          replace_stdout = replace_stdout)
+
+        self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'multiline', 'con'],
+                          replace_stdout = replace_stdout)
+
+        self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'multiline', '--terse', 'con'],
+                          replace_stdout = replace_stdout)
+
+        self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'multiline', '--pretty', 'con'],
+                          replace_stdout = replace_stdout)
+
+        self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'tabular', 'con'],
+                          replace_stdout = replace_stdout)
+
+        self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'tabular', '--terse', 'con'],
+                          replace_stdout = replace_stdout)
+
+        self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'tabular', '--pretty', 'con'],
+                          replace_stdout = replace_stdout)
+
+        self.call_nmcli_l(['con', 's', 'ethernet'],
+                          replace_stdout = replace_stdout)
+
+    def test_004(self):
+        self.init_001()
+
+        replace_stdout = []
+
+        replace_stdout.append((lambda: self.srv.findConnectionUuid('con-xx1'), 'UUID-con-xx1-REPLACED-REPLACED-REPLA'))
+
+        self.call_nmcli(['c', 'add', 'type', 'wifi', 'ifname', '*', 'ssid', 'foobar', 'con-name', 'con-xx1'],
+                        replace_stdout = replace_stdout)
+
+        self.call_nmcli(['connection', 'mod', 'con-xx1', 'ip.gateway', ''])
+        self.call_nmcli(['connection', 'mod', 'con-xx1', 'ipv4.gateway', '172.16.0.1'])
+        self.call_nmcli(['connection', 'mod', 'con-xx1', 'ipv6.gateway', '::99'])
+        self.call_nmcli(['connection', 'mod', 'con-xx1', '802.abc', ''])
+        self.call_nmcli(['connection', 'mod', 'con-xx1', '802-11-wireless.band', 'a'])
+
+###############################################################################
+
+def main():
+    global dbus_session_inited
+
+    if len(sys.argv) >= 2 and sys.argv[1] == '--started-with-dbus-session':
+        dbus_session_inited = True
+        del sys.argv[1]
+
+    if not dbus_session_inited:
+        # we don't have yet our own dbus-session. Reexec ourself with
+        # a new dbus-session.
+        try:
+            try:
+                os.execlp('dbus-run-session', 'dbus-run-session', '--', sys.executable, __file__, '--started-with-dbus-session', *sys.argv[1:])
+            except OSError as e:
+                if e.errno != errno.ENOENT:
+                    raise
+                # we have no dbus-run-session in path? Fall-through
+                # to skip tests gracefully
+            else:
+                raise Exception('unknown error during exec')
+        except Exception as e:
+            assert False, ("Failure to re-exec dbus-run-session: %s" % (str(e)))
+
+    if not dbus_session_inited:
+        # we still don't have a D-Bus session. Probably dbus-run-session is not available.
+        # retry with dbus-launch
+        if os.system('type dbus-launch 1>/dev/null') == 0:
+            try:
+                os.execlp('bash', 'bash', '-e', '-c',
+                          'eval `dbus-launch --sh-syntax`;\n' + \
+                          'trap "kill $DBUS_SESSION_BUS_PID" EXIT;\n' + \
+                          '\n' + \
+                          ' '.join([Util.quote(a) for a in [sys.executable, __file__, '--started-with-dbus-session'] + sys.argv[1:]]) + ' \n' + \
+                          '')
+            except Exception as e:
+                m = str(e)
+            else:
+                m = 'unknown error'
+            assert False, ('Failure to re-exec to start script with dbus-launch: %s' % (m))
+
+    r = unittest.main(exit = False)
+
+    if conf.get(ENV_NM_TEST_REGENERATE):
+        make_filename = PathConfiguration.srcdir() + '/test-client.check-on-disk/Makefile.am'
+        s_new = '# generated with `NM_TEST_REGENERATE=1 make check`\n' + \
+                '\n' + \
+                'clients_tests_expected_files = \\\n' + \
+                ''.join([('\tclients/tests/test-client.check-on-disk/%s \\\n' % f) for f in sorted(file_list)]) + \
+                '\t$(NULL)\n'
+        s_new = s_new.encode('utf-8')
+        if s_new != Util.file_read(make_filename):
+            with open(make_filename, 'wb') as f:
+                f.write(s_new)
+
+    sys.exit(not r.result.wasSuccessful())
+
+if __name__ == '__main__':
+    main()