client/tests: move "clients/tests/test-client.py" to "src/tests/client/"

Note that "test-client.py" currently only tests nmcli. But what it does
is to spawn test-networkmanager-service.py and run nmcli against it.

As such, it could really be used to test any NetworkManager client
against the stub service. Hence this test is not under
"src/nmcli/tests", but under "src/tests/client/" where it is more
general.
This commit is contained in:
Thomas Haller 2021-03-15 10:48:32 +01:00
parent d8dd6e94e6
commit 019bc3233a
No known key found for this signature in database
GPG Key ID: 29C2366E4DFC5728
8 changed files with 18962 additions and 18960 deletions

View File

@ -5181,33 +5181,35 @@ $(src_nm_cloud_setup_tests_test_cloud_setup_general_OBJECTS): $(src_libnm_client
endif
###############################################################################
# clients/tests
# src/tests/client
###############################################################################
check-local-clients-tests-test-client: src/nmcli/nmcli clients/tests/test-client.py
mkdir -p "$(builddir)/clients/tests/"
check-local-tests-client: src/nmcli/nmcli src/tests/client/test-client.py
mkdir -p "$(builddir)/src/tests/client/"
"$(builddir)/src/nmcli/nmcli" --version
GI_TYPELIB_PATH="$(abs_builddir)/src/libnm-client-impl$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}" \
LD_LIBRARY_PATH="$(abs_builddir)/src/libnm-client-impl/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}" \
NM_TEST_CLIENT_BUILDDIR="$(abs_builddir)" \
NM_TEST_CLIENT_NMCLI_PATH=src/nmcli/nmcli \
"$(PYTHON)" \
$(srcdir)/clients/tests/test-client.py -v &> "$(builddir)/clients/tests/test-client.log" && r=ok; \
cat "$(builddir)/clients/tests/test-client.log"; \
$(srcdir)/src/tests/client/test-client.py -v &> "$(builddir)/src/tests/client/test-client.log" && r=ok; \
cat "$(builddir)/src/tests/client/test-client.log"; \
test "$$r" = ok
check_local += check-local-clients-tests-test-client
check_local += check-local-tests-client
CLEANFILES += clients/tests/test-client.log
CLEANFILES += src/tests/client/test-client.log
EXTRA_DIST += \
clients/tests/test-client.py \
clients/tests/test-client.check-on-disk/test_001.expected \
clients/tests/test-client.check-on-disk/test_002.expected \
clients/tests/test-client.check-on-disk/test_003.expected \
clients/tests/test-client.check-on-disk/test_004.expected \
src/tests/client/test-client.py \
src/tests/client/test-client.check-on-disk/test_001.expected \
src/tests/client/test-client.check-on-disk/test_002.expected \
src/tests/client/test-client.check-on-disk/test_003.expected \
src/tests/client/test-client.check-on-disk/test_004.expected \
$(NULL)
###############################################################################
check-local-gitlab-ci:
"$(srcdir)/tools/check-gitlab-ci.sh" "$(srcdir)"

View File

@ -1,5 +1,5 @@
size: 391
location: clients/tests/test-client.py:test_001()/1
size: 394
location: src/tests/client/test-client.py:test_001()/1
cmd: $NMCLI
lang: C
returncode: 0
@ -14,8 +14,8 @@ Use "nmcli device show" to get complete information about known devices and
Consult nmcli(1) and nmcli-examples(7) manual pages for complete usage details.
<<<
size: 434
location: clients/tests/test-client.py:test_001()/2
size: 437
location: src/tests/client/test-client.py:test_001()/2
cmd: $NMCLI
lang: pl_PL.UTF-8
returncode: 0
@ -32,8 +32,8 @@ Strony podręcznika nmcli(1) i nmcli-examples(7) zawierają pełne informacje
o użyciu.
<<<
size: 184
location: clients/tests/test-client.py:test_001()/3
size: 187
location: src/tests/client/test-client.py:test_001()/3
cmd: $NMCLI -f AP -mode multiline -p d show wlan0
lang: C
returncode: 10
@ -42,8 +42,8 @@ stderr: 33 bytes
Error: Device 'wlan0' not found.
<<<
size: 210
location: clients/tests/test-client.py:test_001()/4
size: 213
location: src/tests/client/test-client.py:test_001()/4
cmd: $NMCLI -f AP -mode multiline -p d show wlan0
lang: pl_PL.UTF-8
returncode: 10
@ -52,8 +52,8 @@ stderr: 49 bytes
Błąd: Nie odnaleziono urządzenia „wlan0”.
<<<
size: 116
location: clients/tests/test-client.py:test_001()/5
size: 119
location: src/tests/client/test-client.py:test_001()/5
cmd: $NMCLI c s
lang: C
returncode: 0
@ -62,8 +62,8 @@ stdout: 1 bytes
<<<
size: 126
location: clients/tests/test-client.py:test_001()/6
size: 129
location: src/tests/client/test-client.py:test_001()/6
cmd: $NMCLI c s
lang: pl_PL.UTF-8
returncode: 0
@ -72,8 +72,8 @@ stdout: 1 bytes
<<<
size: 188
location: clients/tests/test-client.py:test_001()/7
size: 191
location: src/tests/client/test-client.py:test_001()/7
cmd: $NMCLI bogus s
lang: C
returncode: 2
@ -82,8 +82,8 @@ stderr: 68 bytes
Error: argument 'bogus' not understood. Try passing --help instead.
<<<
size: 217
location: clients/tests/test-client.py:test_001()/8
size: 220
location: src/tests/client/test-client.py:test_001()/8
cmd: $NMCLI bogus s
lang: pl_PL.UTF-8
returncode: 2
@ -92,8 +92,8 @@ stderr: 87 bytes
Błąd: nie zrozumiano parametru „bogus”. Można użyć „--help” zamiast tego.
<<<
size: 1484
location: clients/tests/test-client.py:test_001()/9
size: 1487
location: src/tests/client/test-client.py:test_001()/9
cmd: $NMCLI general permissions
lang: C
returncode: 0
@ -119,8 +119,8 @@ org.freedesktop.NetworkManager.wifi.share.open yes
org.freedesktop.NetworkManager.wifi.share.protected yes
<<<
size: 1513
location: clients/tests/test-client.py:test_001()/10
size: 1516
location: src/tests/client/test-client.py:test_001()/10
cmd: $NMCLI general permissions
lang: pl_PL.UTF-8
returncode: 0
@ -146,8 +146,8 @@ org.freedesktop.NetworkManager.wifi.share.open tak
org.freedesktop.NetworkManager.wifi.share.protected tak
<<<
size: 1614
location: clients/tests/test-client.py:test_001()/11
size: 1617
location: src/tests/client/test-client.py:test_001()/11
cmd: $NMCLI --color yes general permissions
lang: C
returncode: 0
@ -173,8 +173,8 @@ org.freedesktop.NetworkManager.wifi.share.open yes
org.freedesktop.NetworkManager.wifi.share.protected yes
<<<
size: 1642
location: clients/tests/test-client.py:test_001()/12
size: 1645
location: src/tests/client/test-client.py:test_001()/12
cmd: $NMCLI --color yes general permissions
lang: pl_PL.UTF-8
returncode: 0
@ -200,8 +200,8 @@ org.freedesktop.NetworkManager.wifi.share.open tak
org.freedesktop.NetworkManager.wifi.share.protected tak
<<<
size: 1691
location: clients/tests/test-client.py:test_001()/13
size: 1694
location: src/tests/client/test-client.py:test_001()/13
cmd: $NMCLI --pretty general permissions
lang: C
returncode: 0
@ -231,8 +231,8 @@ org.freedesktop.NetworkManager.wifi.share.open yes
org.freedesktop.NetworkManager.wifi.share.protected yes
<<<
size: 1749
location: clients/tests/test-client.py:test_001()/14
size: 1752
location: src/tests/client/test-client.py:test_001()/14
cmd: $NMCLI --pretty general permissions
lang: pl_PL.UTF-8
returncode: 0
@ -262,8 +262,8 @@ org.freedesktop.NetworkManager.wifi.share.open tak
org.freedesktop.NetworkManager.wifi.share.protected tak
<<<
size: 1820
location: clients/tests/test-client.py:test_001()/15
size: 1823
location: src/tests/client/test-client.py:test_001()/15
cmd: $NMCLI --pretty --color yes general permissions
lang: C
returncode: 0
@ -293,8 +293,8 @@ org.freedesktop.NetworkManager.wifi.share.open yes
org.freedesktop.NetworkManager.wifi.share.protected yes
<<<
size: 1878
location: clients/tests/test-client.py:test_001()/16
size: 1881
location: src/tests/client/test-client.py:test_001()/16
cmd: $NMCLI --pretty --color yes general permissions
lang: pl_PL.UTF-8
returncode: 0
@ -324,8 +324,8 @@ org.freedesktop.NetworkManager.wifi.share.open tak
org.freedesktop.NetworkManager.wifi.share.protected tak
<<<
size: 1090
location: clients/tests/test-client.py:test_001()/17
size: 1093
location: src/tests/client/test-client.py:test_001()/17
cmd: $NMCLI --terse general permissions
lang: C
returncode: 0
@ -350,8 +350,8 @@ org.freedesktop.NetworkManager.wifi.share.open:yes
org.freedesktop.NetworkManager.wifi.share.protected:yes
<<<
size: 1100
location: clients/tests/test-client.py:test_001()/18
size: 1103
location: src/tests/client/test-client.py:test_001()/18
cmd: $NMCLI --terse general permissions
lang: pl_PL.UTF-8
returncode: 0
@ -376,8 +376,8 @@ org.freedesktop.NetworkManager.wifi.share.open:yes
org.freedesktop.NetworkManager.wifi.share.protected:yes
<<<
size: 1220
location: clients/tests/test-client.py:test_001()/19
size: 1223
location: src/tests/client/test-client.py:test_001()/19
cmd: $NMCLI --terse --color yes general permissions
lang: C
returncode: 0
@ -402,8 +402,8 @@ org.freedesktop.NetworkManager.wifi.share.open:yes
org.freedesktop.NetworkManager.wifi.share.protected:yes
<<<
size: 1230
location: clients/tests/test-client.py:test_001()/20
size: 1233
location: src/tests/client/test-client.py:test_001()/20
cmd: $NMCLI --terse --color yes general permissions
lang: pl_PL.UTF-8
returncode: 0
@ -428,8 +428,8 @@ org.freedesktop.NetworkManager.wifi.share.open:yes
org.freedesktop.NetworkManager.wifi.share.protected:yes
<<<
size: 1500
location: clients/tests/test-client.py:test_001()/21
size: 1503
location: src/tests/client/test-client.py:test_001()/21
cmd: $NMCLI --mode tabular general permissions
lang: C
returncode: 0
@ -455,8 +455,8 @@ org.freedesktop.NetworkManager.wifi.share.open yes
org.freedesktop.NetworkManager.wifi.share.protected yes
<<<
size: 1528
location: clients/tests/test-client.py:test_001()/22
size: 1531
location: src/tests/client/test-client.py:test_001()/22
cmd: $NMCLI --mode tabular general permissions
lang: pl_PL.UTF-8
returncode: 0
@ -482,8 +482,8 @@ org.freedesktop.NetworkManager.wifi.share.open tak
org.freedesktop.NetworkManager.wifi.share.protected tak
<<<
size: 1629
location: clients/tests/test-client.py:test_001()/23
size: 1632
location: src/tests/client/test-client.py:test_001()/23
cmd: $NMCLI --mode tabular --color yes general permissions
lang: C
returncode: 0
@ -509,8 +509,8 @@ org.freedesktop.NetworkManager.wifi.share.open yes
org.freedesktop.NetworkManager.wifi.share.protected yes
<<<
size: 1657
location: clients/tests/test-client.py:test_001()/24
size: 1660
location: src/tests/client/test-client.py:test_001()/24
cmd: $NMCLI --mode tabular --color yes general permissions
lang: pl_PL.UTF-8
returncode: 0
@ -536,8 +536,8 @@ org.freedesktop.NetworkManager.wifi.share.open tak
org.freedesktop.NetworkManager.wifi.share.protected tak
<<<
size: 1706
location: clients/tests/test-client.py:test_001()/25
size: 1709
location: src/tests/client/test-client.py:test_001()/25
cmd: $NMCLI --mode tabular --pretty general permissions
lang: C
returncode: 0
@ -567,8 +567,8 @@ org.freedesktop.NetworkManager.wifi.share.open yes
org.freedesktop.NetworkManager.wifi.share.protected yes
<<<
size: 1764
location: clients/tests/test-client.py:test_001()/26
size: 1767
location: src/tests/client/test-client.py:test_001()/26
cmd: $NMCLI --mode tabular --pretty general permissions
lang: pl_PL.UTF-8
returncode: 0
@ -598,8 +598,8 @@ org.freedesktop.NetworkManager.wifi.share.open tak
org.freedesktop.NetworkManager.wifi.share.protected tak
<<<
size: 1835
location: clients/tests/test-client.py:test_001()/27
size: 1838
location: src/tests/client/test-client.py:test_001()/27
cmd: $NMCLI --mode tabular --pretty --color yes general permissions
lang: C
returncode: 0
@ -629,8 +629,8 @@ org.freedesktop.NetworkManager.wifi.share.open yes
org.freedesktop.NetworkManager.wifi.share.protected yes
<<<
size: 1893
location: clients/tests/test-client.py:test_001()/28
size: 1896
location: src/tests/client/test-client.py:test_001()/28
cmd: $NMCLI --mode tabular --pretty --color yes general permissions
lang: pl_PL.UTF-8
returncode: 0
@ -660,8 +660,8 @@ org.freedesktop.NetworkManager.wifi.share.open tak
org.freedesktop.NetworkManager.wifi.share.protected tak
<<<
size: 1105
location: clients/tests/test-client.py:test_001()/29
size: 1108
location: src/tests/client/test-client.py:test_001()/29
cmd: $NMCLI --mode tabular --terse general permissions
lang: C
returncode: 0
@ -686,8 +686,8 @@ org.freedesktop.NetworkManager.wifi.share.open:yes
org.freedesktop.NetworkManager.wifi.share.protected:yes
<<<
size: 1115
location: clients/tests/test-client.py:test_001()/30
size: 1118
location: src/tests/client/test-client.py:test_001()/30
cmd: $NMCLI --mode tabular --terse general permissions
lang: pl_PL.UTF-8
returncode: 0
@ -712,8 +712,8 @@ org.freedesktop.NetworkManager.wifi.share.open:yes
org.freedesktop.NetworkManager.wifi.share.protected:yes
<<<
size: 1235
location: clients/tests/test-client.py:test_001()/31
size: 1238
location: src/tests/client/test-client.py:test_001()/31
cmd: $NMCLI --mode tabular --terse --color yes general permissions
lang: C
returncode: 0
@ -738,8 +738,8 @@ org.freedesktop.NetworkManager.wifi.share.open:yes
org.freedesktop.NetworkManager.wifi.share.protected:yes
<<<
size: 1245
location: clients/tests/test-client.py:test_001()/32
size: 1248
location: src/tests/client/test-client.py:test_001()/32
cmd: $NMCLI --mode tabular --terse --color yes general permissions
lang: pl_PL.UTF-8
returncode: 0
@ -764,8 +764,8 @@ org.freedesktop.NetworkManager.wifi.share.open:yes
org.freedesktop.NetworkManager.wifi.share.protected:yes
<<<
size: 2460
location: clients/tests/test-client.py:test_001()/33
size: 2463
location: src/tests/client/test-client.py:test_001()/33
cmd: $NMCLI --mode multiline general permissions
lang: C
returncode: 0
@ -807,8 +807,8 @@ PERMISSION: org.freedesktop.NetworkManager.wifi.shar
VALUE: yes
<<<
size: 2477
location: clients/tests/test-client.py:test_001()/34
size: 2480
location: src/tests/client/test-client.py:test_001()/34
cmd: $NMCLI --mode multiline general permissions
lang: pl_PL.UTF-8
returncode: 0
@ -850,8 +850,8 @@ PERMISSION: org.freedesktop.NetworkManager.wifi.shar
VALUE: tak
<<<
size: 2589
location: clients/tests/test-client.py:test_001()/35
size: 2592
location: src/tests/client/test-client.py:test_001()/35
cmd: $NMCLI --mode multiline --color yes general permissions
lang: C
returncode: 0
@ -893,8 +893,8 @@ PERMISSION: org.freedesktop.NetworkManager.wifi.shar
VALUE: yes
<<<
size: 2606
location: clients/tests/test-client.py:test_001()/36
size: 2609
location: src/tests/client/test-client.py:test_001()/36
cmd: $NMCLI --mode multiline --color yes general permissions
lang: pl_PL.UTF-8
returncode: 0
@ -936,8 +936,8 @@ PERMISSION: org.freedesktop.NetworkManager.wifi.shar
VALUE: tak
<<<
size: 4042
location: clients/tests/test-client.py:test_001()/37
size: 4045
location: src/tests/client/test-client.py:test_001()/37
cmd: $NMCLI --mode multiline --pretty general permissions
lang: C
returncode: 0
@ -999,8 +999,8 @@ VALUE: yes
-------------------------------------------------------------------------------
<<<
size: 4064
location: clients/tests/test-client.py:test_001()/38
size: 4067
location: src/tests/client/test-client.py:test_001()/38
cmd: $NMCLI --mode multiline --pretty general permissions
lang: pl_PL.UTF-8
returncode: 0
@ -1062,8 +1062,8 @@ VALUE: tak
-------------------------------------------------------------------------------
<<<
size: 4171
location: clients/tests/test-client.py:test_001()/39
size: 4174
location: src/tests/client/test-client.py:test_001()/39
cmd: $NMCLI --mode multiline --pretty --color yes general permissions
lang: C
returncode: 0
@ -1125,8 +1125,8 @@ VALUE: yes
-------------------------------------------------------------------------------
<<<
size: 4193
location: clients/tests/test-client.py:test_001()/40
size: 4196
location: src/tests/client/test-client.py:test_001()/40
cmd: $NMCLI --mode multiline --pretty --color yes general permissions
lang: pl_PL.UTF-8
returncode: 0
@ -1188,8 +1188,8 @@ VALUE: tak
-------------------------------------------------------------------------------
<<<
size: 1397
location: clients/tests/test-client.py:test_001()/41
size: 1400
location: src/tests/client/test-client.py:test_001()/41
cmd: $NMCLI --mode multiline --terse general permissions
lang: C
returncode: 0
@ -1231,8 +1231,8 @@ PERMISSION:org.freedesktop.NetworkManager.wifi.share.protected
VALUE:yes
<<<
size: 1407
location: clients/tests/test-client.py:test_001()/42
size: 1410
location: src/tests/client/test-client.py:test_001()/42
cmd: $NMCLI --mode multiline --terse general permissions
lang: pl_PL.UTF-8
returncode: 0
@ -1274,8 +1274,8 @@ PERMISSION:org.freedesktop.NetworkManager.wifi.share.protected
VALUE:yes
<<<
size: 1526
location: clients/tests/test-client.py:test_001()/43
size: 1529
location: src/tests/client/test-client.py:test_001()/43
cmd: $NMCLI --mode multiline --terse --color yes general permissions
lang: C
returncode: 0
@ -1317,8 +1317,8 @@ PERMISSION:org.freedesktop.NetworkManager.wifi.share.protected
VALUE:yes
<<<
size: 1536
location: clients/tests/test-client.py:test_001()/44
size: 1539
location: src/tests/client/test-client.py:test_001()/44
cmd: $NMCLI --mode multiline --terse --color yes general permissions
lang: pl_PL.UTF-8
returncode: 0

View File

@ -1,5 +1,5 @@
size: 373
location: clients/tests/test-client.py:test_002()/1
size: 376
location: src/tests/client/test-client.py:test_002()/1
cmd: $NMCLI d
lang: C
returncode: 0
@ -13,8 +13,8 @@ wlan1 wifi unavailable --
wlan1 wifi unavailable --
<<<
size: 388
location: clients/tests/test-client.py:test_002()/2
size: 391
location: src/tests/client/test-client.py:test_002()/2
cmd: $NMCLI d
lang: pl_PL.UTF-8
returncode: 0
@ -28,8 +28,8 @@ wlan1 wifi niedostępne --
wlan1 wifi niedostępne --
<<<
size: 974
location: clients/tests/test-client.py:test_002()/3
size: 977
location: src/tests/client/test-client.py:test_002()/3
cmd: $NMCLI -f all d
lang: C
returncode: 0
@ -43,8 +43,8 @@ wlan1 wifi unavailable unknown unknown /org/freedesk
wlan1 wifi unavailable unknown unknown /org/freedesktop/NetworkManager/Devices/5 -- -- --
<<<
size: 989
location: clients/tests/test-client.py:test_002()/4
size: 992
location: src/tests/client/test-client.py:test_002()/4
cmd: $NMCLI -f all d
lang: pl_PL.UTF-8
returncode: 0
@ -58,8 +58,8 @@ wlan1 wifi niedostępne nieznane nieznane /org/freedes
wlan1 wifi niedostępne nieznane nieznane /org/freedesktop/NetworkManager/Devices/5 -- -- --
<<<
size: 735
location: clients/tests/test-client.py:test_002()/5
size: 738
location: src/tests/client/test-client.py:test_002()/5
cmd: $NMCLI
lang: C
returncode: 0
@ -94,8 +94,8 @@ Use "nmcli device show" to get complete information about known devices and
Consult nmcli(1) and nmcli-examples(7) manual pages for complete usage details.
<<<
size: 808
location: clients/tests/test-client.py:test_002()/6
size: 811
location: src/tests/client/test-client.py:test_002()/6
cmd: $NMCLI
lang: pl_PL.UTF-8
returncode: 0
@ -132,8 +132,8 @@ Strony podręcznika nmcli(1) i nmcli-examples(7) zawierają pełne informacje
o użyciu.
<<<
size: 1420
location: clients/tests/test-client.py:test_002()/7
size: 1423
location: src/tests/client/test-client.py:test_002()/7
cmd: $NMCLI -f AP -mode multiline d show wlan0
lang: C
returncode: 0
@ -168,8 +168,8 @@ AP[3].BARS: **
AP[3].SECURITY: WPA1 WPA2
<<<
size: 1457
location: clients/tests/test-client.py:test_002()/8
size: 1460
location: src/tests/client/test-client.py:test_002()/8
cmd: $NMCLI -f AP -mode multiline d show wlan0
lang: pl_PL.UTF-8
returncode: 0
@ -204,8 +204,8 @@ AP[3].BARS: **
AP[3].SECURITY: WPA1 WPA2
<<<
size: 1874
location: clients/tests/test-client.py:test_002()/9
size: 1877
location: src/tests/client/test-client.py:test_002()/9
cmd: $NMCLI -f AP -mode multiline -p d show wlan0
lang: C
returncode: 0
@ -246,8 +246,8 @@ AP[3].SECURITY: WPA1 WPA2
-------------------------------------------------------------------------------
<<<
size: 1919
location: clients/tests/test-client.py:test_002()/10
size: 1922
location: src/tests/client/test-client.py:test_002()/10
cmd: $NMCLI -f AP -mode multiline -p d show wlan0
lang: pl_PL.UTF-8
returncode: 0
@ -288,8 +288,8 @@ AP[3].SECURITY: WPA1 WPA2
-------------------------------------------------------------------------------
<<<
size: 667
location: clients/tests/test-client.py:test_002()/11
size: 670
location: src/tests/client/test-client.py:test_002()/11
cmd: $NMCLI -f AP -mode multiline -t d show wlan0
lang: C
returncode: 0
@ -324,8 +324,8 @@ AP[3].BARS:**
AP[3].SECURITY:WPA1 WPA2
<<<
size: 704
location: clients/tests/test-client.py:test_002()/12
size: 707
location: src/tests/client/test-client.py:test_002()/12
cmd: $NMCLI -f AP -mode multiline -t d show wlan0
lang: pl_PL.UTF-8
returncode: 0
@ -360,8 +360,8 @@ AP[3].BARS:**
AP[3].SECURITY:WPA1 WPA2
<<<
size: 527
location: clients/tests/test-client.py:test_002()/13
size: 530
location: src/tests/client/test-client.py:test_002()/13
cmd: $NMCLI -f AP -mode tabular d show wlan0
lang: C
returncode: 0
@ -373,8 +373,8 @@ AP[2] 90:B1:5F:9E:E0:E3 wlan0-ap-1 Infra 1 54 Mbit/s 44 **
AP[3] 61:66:D2:E7:44:A2 wlan0-ap-2 Infra 1 54 Mbit/s 34 ** WPA1 WPA2
<<<
size: 571
location: clients/tests/test-client.py:test_002()/14
size: 574
location: src/tests/client/test-client.py:test_002()/14
cmd: $NMCLI -f AP -mode tabular d show wlan0
lang: pl_PL.UTF-8
returncode: 0
@ -386,8 +386,8 @@ AP[2] 90:B1:5F:9E:E0:E3 wlan0-ap-1 Infrastruktura 1 54Mb/s 4
AP[3] 61:66:D2:E7:44:A2 wlan0-ap-2 Infrastruktura 1 54Mb/s 34 ** WPA1 WPA2
<<<
size: 705
location: clients/tests/test-client.py:test_002()/15
size: 708
location: src/tests/client/test-client.py:test_002()/15
cmd: $NMCLI -f AP -mode tabular -p d show wlan0
lang: C
returncode: 0
@ -403,8 +403,8 @@ AP[2] 90:B1:5F:9E:E0:E3 wlan0-ap-1 Infra 1 54 Mbit/s 44 **
AP[3] 61:66:D2:E7:44:A2 wlan0-ap-2 Infra 1 54 Mbit/s 34 ** WPA1 WPA2
<<<
size: 785
location: clients/tests/test-client.py:test_002()/16
size: 788
location: src/tests/client/test-client.py:test_002()/16
cmd: $NMCLI -f AP -mode tabular -p d show wlan0
lang: pl_PL.UTF-8
returncode: 0
@ -420,8 +420,8 @@ AP[2] 90:B1:5F:9E:E0:E3 wlan0-ap-1 Infrastruktura 1 54Mb/s 4
AP[3] 61:66:D2:E7:44:A2 wlan0-ap-2 Infrastruktura 1 54Mb/s 34 ** WPA1 WPA2
<<<
size: 374
location: clients/tests/test-client.py:test_002()/17
size: 377
location: src/tests/client/test-client.py:test_002()/17
cmd: $NMCLI -f AP -mode tabular -t d show wlan0
lang: C
returncode: 0
@ -432,8 +432,8 @@ AP[2]: :90\:B1\:5F\:9E\:E0\:E3:wlan0-ap-1:Infra:1:54 Mbit/s:44:** :WPA1
AP[3]: :61\:66\:D2\:E7\:44\:A2:wlan0-ap-2:Infra:1:54 Mbit/s:34:** :WPA1 WPA2
<<<
size: 411
location: clients/tests/test-client.py:test_002()/18
size: 414
location: src/tests/client/test-client.py:test_002()/18
cmd: $NMCLI -f AP -mode tabular -t d show wlan0
lang: pl_PL.UTF-8
returncode: 0
@ -444,8 +444,8 @@ AP[2]: :90\:B1\:5F\:9E\:E0\:E3:wlan0-ap-1:Infrastruktura:1:54Mb/s:44:** :WPA
AP[3]: :61\:66\:D2\:E7\:44\:A2:wlan0-ap-2:Infrastruktura:1:54Mb/s:34:** :WPA1 WPA2
<<<
size: 1969
location: clients/tests/test-client.py:test_002()/19
size: 1972
location: src/tests/client/test-client.py:test_002()/19
cmd: $NMCLI -f ALL d wifi
lang: C
returncode: 0
@ -462,8 +462,8 @@ AP[1] wlan1-ap-4 776C616E312D61702D34 EE:52:8B:49:A1:96 Infra 1 2412 MH
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
<<<
size: 2037
location: clients/tests/test-client.py:test_002()/20
size: 2040
location: src/tests/client/test-client.py:test_002()/20
cmd: $NMCLI -f ALL d wifi
lang: pl_PL.UTF-8
returncode: 0
@ -480,8 +480,8 @@ AP[1] wlan1-ap-4 776C616E312D61702D34 EE:52:8B:49:A1:96 Infrastruktura 1
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
<<<
size: 242
location: clients/tests/test-client.py:test_002()/21
size: 245
location: src/tests/client/test-client.py:test_002()/21
cmd: $NMCLI c
lang: C
returncode: 0
@ -491,8 +491,8 @@ NAME UUID TYPE DEVICE
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet --
<<<
size: 252
location: clients/tests/test-client.py:test_002()/22
size: 255
location: src/tests/client/test-client.py:test_002()/22
cmd: $NMCLI c
lang: pl_PL.UTF-8
returncode: 0
@ -502,8 +502,8 @@ NAME UUID TYPE DEVICE
con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet --
<<<
size: 1263
location: clients/tests/test-client.py:test_002()/23
size: 1266
location: src/tests/client/test-client.py:test_002()/23
cmd: $NMCLI c s con-1
lang: C
returncode: 0
@ -535,8 +535,8 @@ connection.llmnr: -1 (default)
connection.wait-device-timeout: -1
<<<
size: 1275
location: clients/tests/test-client.py:test_002()/24
size: 1278
location: src/tests/client/test-client.py:test_002()/24
cmd: $NMCLI c s con-1
lang: pl_PL.UTF-8
returncode: 0

View File

@ -6,7 +6,7 @@ from __future__ import print_function
#
# This test starts NetworkManager stub service in a user D-Bus session,
# and runs nmcli against it. The output is recorded and compared to a pre-generated
# expected output (clients/tests/test-client.check-on-disk/*.expected) which
# expected output (src/tests/client/test-client.check-on-disk/*.expected) which
# is also committed to git.
#
###############################################################################
@ -32,7 +32,7 @@ from __future__ import print_function
# # and that it works in principle.
# # Then install NetworkManager in the configured prefix (make install)
# # and verify that ./src/nmcli/nmcli also gives you Polish.
# $ NM_TEST_REGENERATE=1 make check-local-clients-tests-test-client
# $ NM_TEST_REGENERATE=1 make check-local-tests-client
# # Set NM_TEST_REGENERATE=1 to regenerate all files.
# $ git diff ... ; git add ...
# # (optional step)
@ -117,7 +117,7 @@ class PathConfiguration:
@staticmethod
def top_srcdir():
return os.path.abspath(PathConfiguration.srcdir() + "/../..")
return os.path.abspath(PathConfiguration.srcdir() + "/../../..")
@staticmethod
def test_networkmanager_service_path():
@ -129,7 +129,7 @@ class PathConfiguration:
@staticmethod
def canonical_script_filename():
p = "clients/tests/test-client.py"
p = "src/tests/client/test-client.py"
assert (PathConfiguration.top_srcdir() + "/" + p) == os.path.abspath(__file__)
return p