From ee85151a4ad400a1e43aa50d47a083f1d1d46584 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sun, 27 May 2018 20:58:21 +0200 Subject: [PATCH] clients/tests: generate Makefile.am for expected files The developer can re-generate .expected files with $ NM_TEST_REGENERATE=1 ./clients/tests/test-client.py Note that these files are also dist-ed, so that the tests also work from a source-tarball. For that, we need to add them to EXTRA_DIST. Previously, this was done manually in the base Makefile.am file. This was cumbersome, because when adding a new test, the developer would need to manually add the files. Now, let the test (with NM_TEST_REGENERATE=1) also generate a makefile part. --- Makefile.am | 111 +----------------- .../test-client.check-on-disk/Makefile.am | 108 +++++++++++++++++ .../test_001-001.expected | 2 +- .../test_001-002.expected | 2 +- .../test_001-003.expected | 2 +- .../test_001-004.expected | 2 +- .../test_001-005.expected | 2 +- .../test_001-006.expected | 2 +- .../test_001-007.expected | 2 +- .../test_001-008.expected | 2 +- .../test_001-009.expected | 2 +- .../test_001-010.expected | 2 +- .../test_001-011.expected | 2 +- .../test_001-012.expected | 2 +- .../test_001-013.expected | 2 +- .../test_001-014.expected | 2 +- .../test_001-015.expected | 2 +- .../test_001-016.expected | 2 +- .../test_001-017.expected | 2 +- .../test_001-018.expected | 2 +- .../test_001-019.expected | 2 +- .../test_001-020.expected | 2 +- .../test_001-021.expected | 2 +- .../test_001-022.expected | 2 +- .../test_001-023.expected | 2 +- .../test_001-024.expected | 2 +- .../test_001-025.expected | 2 +- .../test_001-026.expected | 2 +- .../test_002-001.expected | 2 +- .../test_002-002.expected | 2 +- .../test_002-003.expected | 2 +- .../test_002-004.expected | 2 +- .../test_002-005.expected | 2 +- .../test_002-006.expected | 2 +- .../test_002-007.expected | 2 +- .../test_002-008.expected | 2 +- .../test_002-009.expected | 2 +- .../test_002-010.expected | 2 +- .../test_002-011.expected | 2 +- .../test_002-012.expected | 2 +- .../test_002-013.expected | 2 +- .../test_002-014.expected | 2 +- .../test_002-015.expected | 2 +- .../test_002-016.expected | 2 +- .../test_002-017.expected | 2 +- .../test_002-018.expected | 2 +- .../test_002-019.expected | 2 +- .../test_002-020.expected | 2 +- .../test_002-021.expected | 2 +- .../test_002-022.expected | 2 +- .../test_002-023.expected | 2 +- .../test_002-024.expected | 2 +- .../test_003-001.expected | 2 +- .../test_003-002.expected | 2 +- .../test_003-003.expected | 2 +- .../test_003-004.expected | 2 +- .../test_003-005.expected | 2 +- .../test_003-006.expected | 2 +- .../test_003-007.expected | 2 +- .../test_003-008.expected | 2 +- .../test_003-009.expected | 2 +- .../test_003-010.expected | 2 +- .../test_003-011.expected | 2 +- .../test_003-012.expected | 2 +- .../test_003-013.expected | 2 +- .../test_003-014.expected | 2 +- .../test_003-015.expected | 2 +- .../test_003-016.expected | 2 +- .../test_003-017.expected | 2 +- .../test_003-018.expected | 2 +- .../test_003-019.expected | 2 +- .../test_003-020.expected | 2 +- .../test_003-021.expected | 2 +- .../test_003-022.expected | 2 +- .../test_003-023.expected | 2 +- .../test_003-024.expected | 2 +- .../test_003-025.expected | 2 +- .../test_003-026.expected | 2 +- .../test_003-027.expected | 2 +- .../test_003-028.expected | 2 +- .../test_003-029.expected | 2 +- .../test_003-030.expected | 2 +- .../test_003-031.expected | 2 +- .../test_003-032.expected | 2 +- .../test_003-033.expected | 2 +- .../test_003-034.expected | 2 +- .../test_003-035.expected | 2 +- .../test_003-036.expected | 2 +- .../test_003-037.expected | 2 +- .../test_003-038.expected | 2 +- .../test_003-039.expected | 2 +- .../test_003-040.expected | 2 +- .../test_003-041.expected | 2 +- .../test_003-042.expected | 2 +- .../test_003-043.expected | 2 +- .../test_003-044.expected | 2 +- .../test_003-045.expected | 2 +- .../test_003-046.expected | 2 +- .../test_003-047.expected | 2 +- .../test_003-048.expected | 2 +- .../test_003-049.expected | 2 +- .../test_003-050.expected | 2 +- .../test_003-051.expected | 2 +- .../test_003-052.expected | 2 +- .../test_003-053.expected | 2 +- .../test_003-054.expected | 2 +- clients/tests/test-client.py | 37 ++++-- 107 files changed, 246 insertions(+), 218 deletions(-) create mode 100644 clients/tests/test-client.check-on-disk/Makefile.am diff --git a/Makefile.am b/Makefile.am index 1dea04400f..75283d47ae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3804,115 +3804,12 @@ check_local += check-local-clients-tests-test-client CLEANFILES += clients/tests/test-client.log +include clients/tests/test-client.check-on-disk/Makefile.am + EXTRA_DIST += \ clients/tests/test-client.py \ - \ - 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 \ - \ - $(NULL) + clients/tests/test-client.check-on-disk/Makefile.am \ + $(clients_tests_expected_files) ############################################################################### # data 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 0000000000..50897f8e1f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/Makefile.am @@ -0,0 +1,108 @@ +# 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 \ + $(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 index 6132deea3f..0d1cbd4d86 100644 --- a/clients/tests/test-client.check-on-disk/test_001-001.expected +++ b/clients/tests/test-client.check-on-disk/test_001-001.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:577:test_001()/1 +location: clients/tests/test-client.py:586:test_001()/1 cmd: $NMCLI lang: C returncode: 0 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 index 75b8827e3d..8a79af5c93 100644 --- a/clients/tests/test-client.check-on-disk/test_001-002.expected +++ b/clients/tests/test-client.check-on-disk/test_001-002.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:577:test_001()/2 +location: clients/tests/test-client.py:586:test_001()/2 cmd: $NMCLI lang: pl_PL.UTF-8 returncode: 0 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 index b98da49fe7..3cb5cd2119 100644 --- a/clients/tests/test-client.check-on-disk/test_001-003.expected +++ b/clients/tests/test-client.check-on-disk/test_001-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:579:test_001()/3 +location: clients/tests/test-client.py:588:test_001()/3 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: C returncode: 10 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 index 4b38d92160..f68e437c50 100644 --- a/clients/tests/test-client.check-on-disk/test_001-004.expected +++ b/clients/tests/test-client.check-on-disk/test_001-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:579:test_001()/4 +location: clients/tests/test-client.py:588:test_001()/4 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: pl_PL.UTF-8 returncode: 10 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 index 854fffa450..bb1d52ba06 100644 --- a/clients/tests/test-client.check-on-disk/test_001-005.expected +++ b/clients/tests/test-client.check-on-disk/test_001-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:581:test_001()/5 +location: clients/tests/test-client.py:590:test_001()/5 cmd: $NMCLI c s lang: C returncode: 0 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 index 6e65b2b00d..92bf33e248 100644 --- a/clients/tests/test-client.check-on-disk/test_001-006.expected +++ b/clients/tests/test-client.check-on-disk/test_001-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:581:test_001()/6 +location: clients/tests/test-client.py:590:test_001()/6 cmd: $NMCLI c s lang: pl_PL.UTF-8 returncode: 0 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 index 2854fb8a74..6da72f538f 100644 --- a/clients/tests/test-client.check-on-disk/test_001-007.expected +++ b/clients/tests/test-client.check-on-disk/test_001-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:583:test_001()/7 +location: clients/tests/test-client.py:592:test_001()/7 cmd: $NMCLI bogus s lang: C returncode: 2 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 index 40a76d5f79..787184423a 100644 --- a/clients/tests/test-client.check-on-disk/test_001-008.expected +++ b/clients/tests/test-client.check-on-disk/test_001-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:583:test_001()/8 +location: clients/tests/test-client.py:592:test_001()/8 cmd: $NMCLI bogus s lang: pl_PL.UTF-8 returncode: 2 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 index 9437116ef8..beffd1a78e 100644 --- a/clients/tests/test-client.check-on-disk/test_001-009.expected +++ b/clients/tests/test-client.check-on-disk/test_001-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:591:test_001()/9 +location: clients/tests/test-client.py:600:test_001()/9 cmd: $NMCLI general permissions lang: C returncode: 0 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 index 9ca2c44b6b..f155ddbda5 100644 --- a/clients/tests/test-client.check-on-disk/test_001-010.expected +++ b/clients/tests/test-client.check-on-disk/test_001-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:591:test_001()/10 +location: clients/tests/test-client.py:600:test_001()/10 cmd: $NMCLI general permissions lang: pl_PL.UTF-8 returncode: 0 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 index 739d1aeef6..688692f08f 100644 --- a/clients/tests/test-client.check-on-disk/test_001-011.expected +++ b/clients/tests/test-client.check-on-disk/test_001-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:591:test_001()/11 +location: clients/tests/test-client.py:600:test_001()/11 cmd: $NMCLI --pretty general permissions lang: C returncode: 0 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 index f9d557ffe1..9e84bcc195 100644 --- a/clients/tests/test-client.check-on-disk/test_001-012.expected +++ b/clients/tests/test-client.check-on-disk/test_001-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:591:test_001()/12 +location: clients/tests/test-client.py:600:test_001()/12 cmd: $NMCLI --pretty general permissions lang: pl_PL.UTF-8 returncode: 0 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 index ac38d3e4e1..1e56db90c5 100644 --- a/clients/tests/test-client.check-on-disk/test_001-013.expected +++ b/clients/tests/test-client.check-on-disk/test_001-013.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:591:test_001()/13 +location: clients/tests/test-client.py:600:test_001()/13 cmd: $NMCLI --terse general permissions lang: C returncode: 0 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 index d015468efc..6d3a7e3e57 100644 --- a/clients/tests/test-client.check-on-disk/test_001-014.expected +++ b/clients/tests/test-client.check-on-disk/test_001-014.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:591:test_001()/14 +location: clients/tests/test-client.py:600:test_001()/14 cmd: $NMCLI --terse general permissions lang: pl_PL.UTF-8 returncode: 0 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 index eb5bc31e1a..a0415e5d2a 100644 --- a/clients/tests/test-client.check-on-disk/test_001-015.expected +++ b/clients/tests/test-client.check-on-disk/test_001-015.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:591:test_001()/15 +location: clients/tests/test-client.py:600:test_001()/15 cmd: $NMCLI --mode tabular general permissions lang: C returncode: 0 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 index db1026906b..99663d2c80 100644 --- a/clients/tests/test-client.check-on-disk/test_001-016.expected +++ b/clients/tests/test-client.check-on-disk/test_001-016.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:591:test_001()/16 +location: clients/tests/test-client.py:600:test_001()/16 cmd: $NMCLI --mode tabular general permissions lang: pl_PL.UTF-8 returncode: 0 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 index 300f608b9b..3c9736b5b1 100644 --- a/clients/tests/test-client.check-on-disk/test_001-017.expected +++ b/clients/tests/test-client.check-on-disk/test_001-017.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:591:test_001()/17 +location: clients/tests/test-client.py:600:test_001()/17 cmd: $NMCLI --mode tabular --pretty general permissions lang: C returncode: 0 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 index 5d871fd54b..b6c7882bf0 100644 --- a/clients/tests/test-client.check-on-disk/test_001-018.expected +++ b/clients/tests/test-client.check-on-disk/test_001-018.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:591:test_001()/18 +location: clients/tests/test-client.py:600:test_001()/18 cmd: $NMCLI --mode tabular --pretty general permissions lang: pl_PL.UTF-8 returncode: 0 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 index 5a34b8cd7b..cd39d207fb 100644 --- a/clients/tests/test-client.check-on-disk/test_001-019.expected +++ b/clients/tests/test-client.check-on-disk/test_001-019.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:591:test_001()/19 +location: clients/tests/test-client.py:600:test_001()/19 cmd: $NMCLI --mode tabular --terse general permissions lang: C returncode: 0 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 index 8bf5c70105..6e4ebfcad5 100644 --- a/clients/tests/test-client.check-on-disk/test_001-020.expected +++ b/clients/tests/test-client.check-on-disk/test_001-020.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:591:test_001()/20 +location: clients/tests/test-client.py:600:test_001()/20 cmd: $NMCLI --mode tabular --terse general permissions lang: pl_PL.UTF-8 returncode: 0 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 index dc61542d0b..a955355149 100644 --- a/clients/tests/test-client.check-on-disk/test_001-021.expected +++ b/clients/tests/test-client.check-on-disk/test_001-021.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:591:test_001()/21 +location: clients/tests/test-client.py:600:test_001()/21 cmd: $NMCLI --mode multiline general permissions lang: C returncode: 0 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 index 97c1e0aed2..776de8adb5 100644 --- a/clients/tests/test-client.check-on-disk/test_001-022.expected +++ b/clients/tests/test-client.check-on-disk/test_001-022.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:591:test_001()/22 +location: clients/tests/test-client.py:600:test_001()/22 cmd: $NMCLI --mode multiline general permissions lang: pl_PL.UTF-8 returncode: 0 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 index 3eb4fe0d9b..bef1d86446 100644 --- a/clients/tests/test-client.check-on-disk/test_001-023.expected +++ b/clients/tests/test-client.check-on-disk/test_001-023.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:591:test_001()/23 +location: clients/tests/test-client.py:600:test_001()/23 cmd: $NMCLI --mode multiline --pretty general permissions lang: C returncode: 0 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 index ededc00eda..c9598ff1bd 100644 --- a/clients/tests/test-client.check-on-disk/test_001-024.expected +++ b/clients/tests/test-client.check-on-disk/test_001-024.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:591:test_001()/24 +location: clients/tests/test-client.py:600:test_001()/24 cmd: $NMCLI --mode multiline --pretty general permissions lang: pl_PL.UTF-8 returncode: 0 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 index 10d73baa74..10c27a3a5b 100644 --- a/clients/tests/test-client.check-on-disk/test_001-025.expected +++ b/clients/tests/test-client.check-on-disk/test_001-025.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:591:test_001()/25 +location: clients/tests/test-client.py:600:test_001()/25 cmd: $NMCLI --mode multiline --terse general permissions lang: C returncode: 0 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 index f5e6d392f6..4451f185ce 100644 --- a/clients/tests/test-client.check-on-disk/test_001-026.expected +++ b/clients/tests/test-client.check-on-disk/test_001-026.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:591:test_001()/26 +location: clients/tests/test-client.py:600:test_001()/26 cmd: $NMCLI --mode multiline --terse general permissions lang: pl_PL.UTF-8 returncode: 0 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 index f5e43b5b94..15f3b4542b 100644 --- a/clients/tests/test-client.check-on-disk/test_002-001.expected +++ b/clients/tests/test-client.check-on-disk/test_002-001.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:596:test_002()/1 +location: clients/tests/test-client.py:605:test_002()/1 cmd: $NMCLI d lang: C returncode: 0 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 index d2a53e43f1..f9b0e5258c 100644 --- a/clients/tests/test-client.check-on-disk/test_002-002.expected +++ b/clients/tests/test-client.check-on-disk/test_002-002.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:596:test_002()/2 +location: clients/tests/test-client.py:605:test_002()/2 cmd: $NMCLI d lang: pl_PL.UTF-8 returncode: 0 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 index f672a9d333..d2dc9229e0 100644 --- a/clients/tests/test-client.check-on-disk/test_002-003.expected +++ b/clients/tests/test-client.check-on-disk/test_002-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:598:test_002()/3 +location: clients/tests/test-client.py:607:test_002()/3 cmd: $NMCLI -f all d lang: C returncode: 0 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 index 63c09cd527..fe9323b04f 100644 --- a/clients/tests/test-client.check-on-disk/test_002-004.expected +++ b/clients/tests/test-client.check-on-disk/test_002-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:598:test_002()/4 +location: clients/tests/test-client.py:607:test_002()/4 cmd: $NMCLI -f all d lang: pl_PL.UTF-8 returncode: 0 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 index 80e316fcdd..63c28c7111 100644 --- a/clients/tests/test-client.check-on-disk/test_002-005.expected +++ b/clients/tests/test-client.check-on-disk/test_002-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:600:test_002()/5 +location: clients/tests/test-client.py:609:test_002()/5 cmd: $NMCLI lang: C returncode: 0 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 index 9d3b593652..473aaa6b38 100644 --- a/clients/tests/test-client.check-on-disk/test_002-006.expected +++ b/clients/tests/test-client.check-on-disk/test_002-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:600:test_002()/6 +location: clients/tests/test-client.py:609:test_002()/6 cmd: $NMCLI lang: pl_PL.UTF-8 returncode: 0 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 index 1a9140f9da..ef1f3aa128 100644 --- a/clients/tests/test-client.check-on-disk/test_002-007.expected +++ b/clients/tests/test-client.check-on-disk/test_002-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:602:test_002()/7 +location: clients/tests/test-client.py:611:test_002()/7 cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: C returncode: 0 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 index 3adfc7f2d1..5422f63522 100644 --- a/clients/tests/test-client.check-on-disk/test_002-008.expected +++ b/clients/tests/test-client.check-on-disk/test_002-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:602:test_002()/8 +location: clients/tests/test-client.py:611:test_002()/8 cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: pl_PL.UTF-8 returncode: 0 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 index d9ebfa1863..03f0e28f2e 100644 --- a/clients/tests/test-client.check-on-disk/test_002-009.expected +++ b/clients/tests/test-client.check-on-disk/test_002-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:603:test_002()/9 +location: clients/tests/test-client.py:612:test_002()/9 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: C returncode: 0 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 index 8232b0b084..ef4cfd06f6 100644 --- a/clients/tests/test-client.check-on-disk/test_002-010.expected +++ b/clients/tests/test-client.check-on-disk/test_002-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:603:test_002()/10 +location: clients/tests/test-client.py:612:test_002()/10 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: pl_PL.UTF-8 returncode: 0 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 index 7894d9afa4..c93bb8f55e 100644 --- a/clients/tests/test-client.check-on-disk/test_002-011.expected +++ b/clients/tests/test-client.check-on-disk/test_002-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:604:test_002()/11 +location: clients/tests/test-client.py:613:test_002()/11 cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: C returncode: 0 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 index 2882c0fc6b..9b7bd5795d 100644 --- a/clients/tests/test-client.check-on-disk/test_002-012.expected +++ b/clients/tests/test-client.check-on-disk/test_002-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:604:test_002()/12 +location: clients/tests/test-client.py:613:test_002()/12 cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: pl_PL.UTF-8 returncode: 0 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 index e5ffec85c5..68cdae538a 100644 --- a/clients/tests/test-client.check-on-disk/test_002-013.expected +++ b/clients/tests/test-client.check-on-disk/test_002-013.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:605:test_002()/13 +location: clients/tests/test-client.py:614:test_002()/13 cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: C returncode: 0 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 index 03b7fcf692..044f71fead 100644 --- a/clients/tests/test-client.check-on-disk/test_002-014.expected +++ b/clients/tests/test-client.check-on-disk/test_002-014.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:605:test_002()/14 +location: clients/tests/test-client.py:614:test_002()/14 cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: pl_PL.UTF-8 returncode: 0 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 index f103bd0684..a1ecc10d0b 100644 --- a/clients/tests/test-client.check-on-disk/test_002-015.expected +++ b/clients/tests/test-client.check-on-disk/test_002-015.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:606:test_002()/15 +location: clients/tests/test-client.py:615:test_002()/15 cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: C returncode: 0 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 index 54e2721330..96bcea42b6 100644 --- a/clients/tests/test-client.check-on-disk/test_002-016.expected +++ b/clients/tests/test-client.check-on-disk/test_002-016.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:606:test_002()/16 +location: clients/tests/test-client.py:615:test_002()/16 cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: pl_PL.UTF-8 returncode: 0 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 index bc10330e87..80bcc5e87c 100644 --- a/clients/tests/test-client.check-on-disk/test_002-017.expected +++ b/clients/tests/test-client.check-on-disk/test_002-017.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:607:test_002()/17 +location: clients/tests/test-client.py:616:test_002()/17 cmd: $NMCLI -f AP -mode tabular -t d show wlan0 lang: C returncode: 0 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 index 2777c7be51..e596f79c6b 100644 --- a/clients/tests/test-client.check-on-disk/test_002-018.expected +++ b/clients/tests/test-client.check-on-disk/test_002-018.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:607:test_002()/18 +location: clients/tests/test-client.py:616:test_002()/18 cmd: $NMCLI -f AP -mode tabular -t d show wlan0 lang: pl_PL.UTF-8 returncode: 0 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 index 94534555d9..32fcbe10ea 100644 --- a/clients/tests/test-client.check-on-disk/test_002-019.expected +++ b/clients/tests/test-client.check-on-disk/test_002-019.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:609:test_002()/19 +location: clients/tests/test-client.py:618:test_002()/19 cmd: $NMCLI -f ALL d wifi lang: C returncode: 0 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 index 5492a105a1..f01cc14511 100644 --- a/clients/tests/test-client.check-on-disk/test_002-020.expected +++ b/clients/tests/test-client.check-on-disk/test_002-020.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:609:test_002()/20 +location: clients/tests/test-client.py:618:test_002()/20 cmd: $NMCLI -f ALL d wifi lang: pl_PL.UTF-8 returncode: 0 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 index 3b1e93b6f4..3459839aa4 100644 --- a/clients/tests/test-client.check-on-disk/test_002-021.expected +++ b/clients/tests/test-client.check-on-disk/test_002-021.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:611:test_002()/21 +location: clients/tests/test-client.py:620:test_002()/21 cmd: $NMCLI c lang: C returncode: 0 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 index 826d1e24e0..a302eba08f 100644 --- a/clients/tests/test-client.check-on-disk/test_002-022.expected +++ b/clients/tests/test-client.check-on-disk/test_002-022.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:611:test_002()/22 +location: clients/tests/test-client.py:620:test_002()/22 cmd: $NMCLI c lang: pl_PL.UTF-8 returncode: 0 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 index 7b2876e4bf..65e70ac396 100644 --- a/clients/tests/test-client.check-on-disk/test_002-023.expected +++ b/clients/tests/test-client.check-on-disk/test_002-023.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:613:test_002()/23 +location: clients/tests/test-client.py:622:test_002()/23 cmd: $NMCLI c s con-1 lang: C returncode: 0 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 index a585d71caf..ff1fe90cfe 100644 --- a/clients/tests/test-client.check-on-disk/test_002-024.expected +++ b/clients/tests/test-client.check-on-disk/test_002-024.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:613:test_002()/24 +location: clients/tests/test-client.py:622:test_002()/24 cmd: $NMCLI c s con-1 lang: pl_PL.UTF-8 returncode: 0 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 index a11cf05ef4..80cc0238fa 100644 --- a/clients/tests/test-client.check-on-disk/test_003-001.expected +++ b/clients/tests/test-client.check-on-disk/test_003-001.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:623:test_003()/1 +location: clients/tests/test-client.py:632:test_003()/1 cmd: $NMCLI c add type ethernet ifname '*' con-name con-xx1 lang: C returncode: 0 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 index bf6248b85d..0d4b814159 100644 --- a/clients/tests/test-client.check-on-disk/test_003-002.expected +++ b/clients/tests/test-client.check-on-disk/test_003-002.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:626:test_003()/2 +location: clients/tests/test-client.py:635:test_003()/2 cmd: $NMCLI c s lang: C returncode: 0 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 index 56b47c4879..c9c28a30ee 100644 --- a/clients/tests/test-client.check-on-disk/test_003-003.expected +++ b/clients/tests/test-client.check-on-disk/test_003-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:626:test_003()/3 +location: clients/tests/test-client.py:635:test_003()/3 cmd: $NMCLI c s lang: pl_PL.UTF-8 returncode: 0 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 index 0debacdbcc..2a827b71a1 100644 --- a/clients/tests/test-client.check-on-disk/test_003-004.expected +++ b/clients/tests/test-client.check-on-disk/test_003-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:631:test_003()/4 +location: clients/tests/test-client.py:640:test_003()/4 cmd: $NMCLI c add type ethernet ifname '*' lang: C returncode: 0 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 index 304d4e7a9a..107b731638 100644 --- a/clients/tests/test-client.check-on-disk/test_003-005.expected +++ b/clients/tests/test-client.check-on-disk/test_003-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:634:test_003()/5 +location: clients/tests/test-client.py:643:test_003()/5 cmd: $NMCLI c s lang: C returncode: 0 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 index 41616799d7..fac53f88a4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-006.expected +++ b/clients/tests/test-client.check-on-disk/test_003-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:634:test_003()/6 +location: clients/tests/test-client.py:643:test_003()/6 cmd: $NMCLI c s lang: pl_PL.UTF-8 returncode: 0 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 index e87f50eb11..058bb9523e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-007.expected +++ b/clients/tests/test-client.check-on-disk/test_003-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:637:test_003()/7 +location: clients/tests/test-client.py:646:test_003()/7 cmd: $NMCLI -f ALL c s lang: C returncode: 0 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 index b91d373e46..d7b9047740 100644 --- a/clients/tests/test-client.check-on-disk/test_003-008.expected +++ b/clients/tests/test-client.check-on-disk/test_003-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:637:test_003()/8 +location: clients/tests/test-client.py:646:test_003()/8 cmd: $NMCLI -f ALL c s lang: pl_PL.UTF-8 returncode: 0 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 index 400428ccaa..b9969e16c0 100644 --- a/clients/tests/test-client.check-on-disk/test_003-009.expected +++ b/clients/tests/test-client.check-on-disk/test_003-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:641:test_003()/9 +location: clients/tests/test-client.py:650:test_003()/9 cmd: $NMCLI --complete-args -f ALL c s '' lang: C returncode: 0 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 index 4592110428..e954f97847 100644 --- a/clients/tests/test-client.check-on-disk/test_003-010.expected +++ b/clients/tests/test-client.check-on-disk/test_003-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:641:test_003()/10 +location: clients/tests/test-client.py:650:test_003()/10 cmd: $NMCLI --complete-args -f ALL c s '' lang: pl_PL.UTF-8 returncode: 0 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 index 4b30fa8e84..ac30cc3717 100644 --- a/clients/tests/test-client.check-on-disk/test_003-011.expected +++ b/clients/tests/test-client.check-on-disk/test_003-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:654:test_003()/11 +location: clients/tests/test-client.py:663:test_003()/11 cmd: $NMCLI con up ethernet ifname eth0 lang: C returncode: 0 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 index 38a71f992f..865bdaf06d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-012.expected +++ b/clients/tests/test-client.check-on-disk/test_003-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:657:test_003()/12 +location: clients/tests/test-client.py:666:test_003()/12 cmd: $NMCLI con lang: C returncode: 0 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 index 532c363dc8..4e12107ac3 100644 --- a/clients/tests/test-client.check-on-disk/test_003-013.expected +++ b/clients/tests/test-client.check-on-disk/test_003-013.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:657:test_003()/13 +location: clients/tests/test-client.py:666:test_003()/13 cmd: $NMCLI con lang: pl_PL.UTF-8 returncode: 0 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 index abd4086e74..ba02193e1a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-014.expected +++ b/clients/tests/test-client.check-on-disk/test_003-014.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:660:test_003()/14 +location: clients/tests/test-client.py:669:test_003()/14 cmd: $NMCLI -f ALL con lang: C returncode: 0 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 index 2e1fafa208..858ebd239c 100644 --- a/clients/tests/test-client.check-on-disk/test_003-015.expected +++ b/clients/tests/test-client.check-on-disk/test_003-015.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:660:test_003()/15 +location: clients/tests/test-client.py:669:test_003()/15 cmd: $NMCLI -f ALL con lang: pl_PL.UTF-8 returncode: 0 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 index 37a5372742..c536471be2 100644 --- a/clients/tests/test-client.check-on-disk/test_003-016.expected +++ b/clients/tests/test-client.check-on-disk/test_003-016.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:663:test_003()/16 +location: clients/tests/test-client.py:672:test_003()/16 cmd: $NMCLI -f ALL con s ethernet lang: C returncode: 0 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 index cef0eeb26e..7b682f84e3 100644 --- a/clients/tests/test-client.check-on-disk/test_003-017.expected +++ b/clients/tests/test-client.check-on-disk/test_003-017.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:663:test_003()/17 +location: clients/tests/test-client.py:672:test_003()/17 cmd: $NMCLI -f ALL con s ethernet lang: pl_PL.UTF-8 returncode: 0 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 index b6fab34a4d..e2aad1a20f 100644 --- a/clients/tests/test-client.check-on-disk/test_003-018.expected +++ b/clients/tests/test-client.check-on-disk/test_003-018.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:666:test_003()/18 +location: clients/tests/test-client.py:675:test_003()/18 cmd: $NMCLI con s ethernet lang: C returncode: 0 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 index 4d169a5691..6f3ecc5752 100644 --- a/clients/tests/test-client.check-on-disk/test_003-019.expected +++ b/clients/tests/test-client.check-on-disk/test_003-019.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:666:test_003()/19 +location: clients/tests/test-client.py:675:test_003()/19 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 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 index 6d081851c7..0ad17f3c5d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-020.expected +++ b/clients/tests/test-client.check-on-disk/test_003-020.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:669:test_003()/20 +location: clients/tests/test-client.py:678:test_003()/20 cmd: $NMCLI -f ALL dev s eth0 lang: C returncode: 0 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 index 65f707ad42..8e4bd7b89f 100644 --- a/clients/tests/test-client.check-on-disk/test_003-021.expected +++ b/clients/tests/test-client.check-on-disk/test_003-021.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:669:test_003()/21 +location: clients/tests/test-client.py:678:test_003()/21 cmd: $NMCLI -f ALL dev s eth0 lang: pl_PL.UTF-8 returncode: 0 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 index 85150efb65..b2f91fa54a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-022.expected +++ b/clients/tests/test-client.check-on-disk/test_003-022.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:672:test_003()/22 +location: clients/tests/test-client.py:681:test_003()/22 cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 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 index e623f1f71c..af6fb64e38 100644 --- a/clients/tests/test-client.check-on-disk/test_003-023.expected +++ b/clients/tests/test-client.check-on-disk/test_003-023.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:672:test_003()/23 +location: clients/tests/test-client.py:681:test_003()/23 cmd: $NMCLI -f ALL dev show eth0 lang: pl_PL.UTF-8 returncode: 0 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 index 86b0f9cfe0..e30adb0a28 100644 --- a/clients/tests/test-client.check-on-disk/test_003-024.expected +++ b/clients/tests/test-client.check-on-disk/test_003-024.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:654:test_003()/24 +location: clients/tests/test-client.py:663:test_003()/24 cmd: $NMCLI con up ethernet ifname eth1 lang: C returncode: 0 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 index c697459918..6a8a414fde 100644 --- a/clients/tests/test-client.check-on-disk/test_003-025.expected +++ b/clients/tests/test-client.check-on-disk/test_003-025.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:657:test_003()/25 +location: clients/tests/test-client.py:666:test_003()/25 cmd: $NMCLI con lang: C returncode: 0 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 index 542748cb9c..a75b80d3b7 100644 --- a/clients/tests/test-client.check-on-disk/test_003-026.expected +++ b/clients/tests/test-client.check-on-disk/test_003-026.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:657:test_003()/26 +location: clients/tests/test-client.py:666:test_003()/26 cmd: $NMCLI con lang: pl_PL.UTF-8 returncode: 0 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 index 993355e094..df5fe07aed 100644 --- a/clients/tests/test-client.check-on-disk/test_003-027.expected +++ b/clients/tests/test-client.check-on-disk/test_003-027.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:660:test_003()/27 +location: clients/tests/test-client.py:669:test_003()/27 cmd: $NMCLI -f ALL con lang: C returncode: 0 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 index d81691e23d..db89b906cc 100644 --- a/clients/tests/test-client.check-on-disk/test_003-028.expected +++ b/clients/tests/test-client.check-on-disk/test_003-028.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:660:test_003()/28 +location: clients/tests/test-client.py:669:test_003()/28 cmd: $NMCLI -f ALL con lang: pl_PL.UTF-8 returncode: 0 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 index 2b0b692f97..895a099def 100644 --- a/clients/tests/test-client.check-on-disk/test_003-029.expected +++ b/clients/tests/test-client.check-on-disk/test_003-029.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:663:test_003()/29 +location: clients/tests/test-client.py:672:test_003()/29 cmd: $NMCLI -f ALL con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-030.expected b/clients/tests/test-client.check-on-disk/test_003-030.expected index c2a6dc8076..e81c47c563 100644 --- a/clients/tests/test-client.check-on-disk/test_003-030.expected +++ b/clients/tests/test-client.check-on-disk/test_003-030.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:663:test_003()/30 +location: clients/tests/test-client.py:672:test_003()/30 cmd: $NMCLI -f ALL con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-031.expected b/clients/tests/test-client.check-on-disk/test_003-031.expected index 435ee70082..0d9fb2872e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-031.expected +++ b/clients/tests/test-client.check-on-disk/test_003-031.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:666:test_003()/31 +location: clients/tests/test-client.py:675:test_003()/31 cmd: $NMCLI con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-032.expected b/clients/tests/test-client.check-on-disk/test_003-032.expected index 814e9f9587..f444f620d6 100644 --- a/clients/tests/test-client.check-on-disk/test_003-032.expected +++ b/clients/tests/test-client.check-on-disk/test_003-032.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:666:test_003()/32 +location: clients/tests/test-client.py:675:test_003()/32 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-033.expected b/clients/tests/test-client.check-on-disk/test_003-033.expected index bb9a46c405..8c87db6c9e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-033.expected +++ b/clients/tests/test-client.check-on-disk/test_003-033.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:669:test_003()/33 +location: clients/tests/test-client.py:678:test_003()/33 cmd: $NMCLI -f ALL dev s eth0 lang: C returncode: 0 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 index 57d5f85436..0f1b6847d3 100644 --- a/clients/tests/test-client.check-on-disk/test_003-034.expected +++ b/clients/tests/test-client.check-on-disk/test_003-034.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:669:test_003()/34 +location: clients/tests/test-client.py:678:test_003()/34 cmd: $NMCLI -f ALL dev s eth0 lang: pl_PL.UTF-8 returncode: 0 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 index c931ecae4a..a764a699d4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-035.expected +++ b/clients/tests/test-client.check-on-disk/test_003-035.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:672:test_003()/35 +location: clients/tests/test-client.py:681:test_003()/35 cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 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 index 1dafe17832..1f4c3bcf3a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-036.expected +++ b/clients/tests/test-client.check-on-disk/test_003-036.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:672:test_003()/36 +location: clients/tests/test-client.py:681:test_003()/36 cmd: $NMCLI -f ALL dev show eth0 lang: pl_PL.UTF-8 returncode: 0 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 index a7bf40ca35..26668ae8ef 100644 --- a/clients/tests/test-client.check-on-disk/test_003-037.expected +++ b/clients/tests/test-client.check-on-disk/test_003-037.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:679:test_003()/37 +location: clients/tests/test-client.py:688:test_003()/37 cmd: $NMCLI -f ALL con lang: C returncode: 0 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 index 36ad79b232..f9f85d2480 100644 --- a/clients/tests/test-client.check-on-disk/test_003-038.expected +++ b/clients/tests/test-client.check-on-disk/test_003-038.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:679:test_003()/38 +location: clients/tests/test-client.py:688:test_003()/38 cmd: $NMCLI -f ALL con lang: pl_PL.UTF-8 returncode: 0 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 index 55ff05cfe1..9f1ab1cc48 100644 --- a/clients/tests/test-client.check-on-disk/test_003-039.expected +++ b/clients/tests/test-client.check-on-disk/test_003-039.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:682:test_003()/39 +location: clients/tests/test-client.py:691:test_003()/39 cmd: $NMCLI -f UUID,TYPE con lang: C returncode: 0 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 index 58f14fa40e..9ffb02ed50 100644 --- a/clients/tests/test-client.check-on-disk/test_003-040.expected +++ b/clients/tests/test-client.check-on-disk/test_003-040.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:682:test_003()/40 +location: clients/tests/test-client.py:691:test_003()/40 cmd: $NMCLI -f UUID,TYPE con lang: pl_PL.UTF-8 returncode: 0 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 index 4bfa6a6fda..b7eba0b576 100644 --- a/clients/tests/test-client.check-on-disk/test_003-041.expected +++ b/clients/tests/test-client.check-on-disk/test_003-041.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:685:test_003()/41 +location: clients/tests/test-client.py:694:test_003()/41 cmd: $NMCLI -f UUID,TYPE --mode multiline con lang: C returncode: 0 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 index 172884a6f7..7ecd32e48a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-042.expected +++ b/clients/tests/test-client.check-on-disk/test_003-042.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:685:test_003()/42 +location: clients/tests/test-client.py:694:test_003()/42 cmd: $NMCLI -f UUID,TYPE --mode multiline con lang: pl_PL.UTF-8 returncode: 0 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 index 9e4b82d459..aebed1fd5e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-043.expected +++ b/clients/tests/test-client.check-on-disk/test_003-043.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:688:test_003()/43 +location: clients/tests/test-client.py:697:test_003()/43 cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con lang: C returncode: 0 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 index c2b1c4e312..b8b116737e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-044.expected +++ b/clients/tests/test-client.check-on-disk/test_003-044.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:688:test_003()/44 +location: clients/tests/test-client.py:697:test_003()/44 cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con lang: pl_PL.UTF-8 returncode: 0 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 index cde8ed1dee..4d9c75ace2 100644 --- a/clients/tests/test-client.check-on-disk/test_003-045.expected +++ b/clients/tests/test-client.check-on-disk/test_003-045.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:691:test_003()/45 +location: clients/tests/test-client.py:700:test_003()/45 cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con lang: C returncode: 0 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 index a459e663b1..d8dc52c291 100644 --- a/clients/tests/test-client.check-on-disk/test_003-046.expected +++ b/clients/tests/test-client.check-on-disk/test_003-046.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:691:test_003()/46 +location: clients/tests/test-client.py:700:test_003()/46 cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con lang: pl_PL.UTF-8 returncode: 0 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 index 9f4ab5c79f..c17d7c8697 100644 --- a/clients/tests/test-client.check-on-disk/test_003-047.expected +++ b/clients/tests/test-client.check-on-disk/test_003-047.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:694:test_003()/47 +location: clients/tests/test-client.py:703:test_003()/47 cmd: $NMCLI -f UUID,TYPE --mode tabular con lang: C returncode: 0 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 index f08b749403..8138a22fd4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-048.expected +++ b/clients/tests/test-client.check-on-disk/test_003-048.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:694:test_003()/48 +location: clients/tests/test-client.py:703:test_003()/48 cmd: $NMCLI -f UUID,TYPE --mode tabular con lang: pl_PL.UTF-8 returncode: 0 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 index c9704ffd10..01008d61d8 100644 --- a/clients/tests/test-client.check-on-disk/test_003-049.expected +++ b/clients/tests/test-client.check-on-disk/test_003-049.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:697:test_003()/49 +location: clients/tests/test-client.py:706:test_003()/49 cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con lang: C returncode: 0 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 index 119ae5875c..84b6670a29 100644 --- a/clients/tests/test-client.check-on-disk/test_003-050.expected +++ b/clients/tests/test-client.check-on-disk/test_003-050.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:697:test_003()/50 +location: clients/tests/test-client.py:706:test_003()/50 cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con lang: pl_PL.UTF-8 returncode: 0 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 index 7a7c0214e3..4eca52d14f 100644 --- a/clients/tests/test-client.check-on-disk/test_003-051.expected +++ b/clients/tests/test-client.check-on-disk/test_003-051.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:700:test_003()/51 +location: clients/tests/test-client.py:709:test_003()/51 cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con lang: C returncode: 0 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 index 9f7feb6b9b..5934722a04 100644 --- a/clients/tests/test-client.check-on-disk/test_003-052.expected +++ b/clients/tests/test-client.check-on-disk/test_003-052.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:700:test_003()/52 +location: clients/tests/test-client.py:709:test_003()/52 cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-053.expected b/clients/tests/test-client.check-on-disk/test_003-053.expected index 8a441cf8ab..b6cbf5dc11 100644 --- a/clients/tests/test-client.check-on-disk/test_003-053.expected +++ b/clients/tests/test-client.check-on-disk/test_003-053.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:703:test_003()/53 +location: clients/tests/test-client.py:712:test_003()/53 cmd: $NMCLI con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-054.expected b/clients/tests/test-client.check-on-disk/test_003-054.expected index 65c45e138d..9417e263c5 100644 --- a/clients/tests/test-client.check-on-disk/test_003-054.expected +++ b/clients/tests/test-client.check-on-disk/test_003-054.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:703:test_003()/54 +location: clients/tests/test-client.py:712:test_003()/54 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index 8fe55d5280..9cc26f2e3d 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -125,6 +125,14 @@ class Util: 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 + ############################################################################### class Configuration: @@ -267,6 +275,8 @@ class NMStubServer: ############################################################################### +file_list = [] + class NmTestBase(unittest.TestCase): pass @@ -457,18 +467,17 @@ class TestNmcli(NmTestBase): dirname = PathConfiguration.srcdir() + '/test-client.check-on-disk' - filename = os.path.abspath(dirname + '/' + test_name + '.expected') + 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 - try: - with open(filename, 'rb') as content_file: - content_old = content_file.read() - except: - content_old = None + file_list.append(basename) + + content_old = Util.file_read(filename) # 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 @@ -745,7 +754,21 @@ def main(): m = 'unknown error' assert False, ('Failure to re-exec to start script with dbus-launch: %s' % (m)) - unittest.main() + 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()