system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 18:54:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Makefile.am
View file

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

0
clients/tests/terminal-colors.d/nmcli.enable → src/tests/client/terminal-colors.d/nmcli.enable
View file

0
clients/tests/terminal-colors.d/nmcli.schem → src/tests/client/terminal-colors.d/nmcli.schem
View file

176
clients/tests/test-client.check-on-disk/test_001.expected → src/tests/client/test-client.check-on-disk/test_001.expected
View file

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

96
clients/tests/test-client.check-on-disk/test_002.expected → src/tests/client/test-client.check-on-disk/test_002.expected
View file

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

10826
clients/tests/test-client.check-on-disk/test_003.expected → src/tests/client/test-client.check-on-disk/test_003.expected
View file

File diff suppressed because it is too large Load diff

26790
clients/tests/test-client.check-on-disk/test_004.expected → src/tests/client/test-client.check-on-disk/test_004.expected
View file

File diff suppressed because it is too large Load diff

8
clients/tests/test-client.py → src/tests/client/test-client.py
View file

@ -6,7 +6,7 @@ from __future__ import print_function
# #
# This test starts NetworkManager stub service in a user D-Bus session, # 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 # 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. # is also committed to git.
# #
############################################################################### ###############################################################################
@ -32,7 +32,7 @@ from __future__ import print_function
# # and that it works in principle. # # and that it works in principle.
# # Then install NetworkManager in the configured prefix (make install) # # Then install NetworkManager in the configured prefix (make install)
# # and verify that ./src/nmcli/nmcli also gives you Polish. # # 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. # # Set NM_TEST_REGENERATE=1 to regenerate all files.
# $ git diff ... ; git add ... # $ git diff ... ; git add ...
# # (optional step) # # (optional step)
@ -117,7 +117,7 @@ class PathConfiguration:
@staticmethod @staticmethod
def top_srcdir(): def top_srcdir():
return os.path.abspath(PathConfiguration.srcdir() + "/../..") return os.path.abspath(PathConfiguration.srcdir() + "/../../..")
@staticmethod @staticmethod
def test_networkmanager_service_path(): def test_networkmanager_service_path():
@ -129,7 +129,7 @@ class PathConfiguration:
@staticmethod @staticmethod
def canonical_script_filename(): 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__) assert (PathConfiguration.top_srcdir() + "/" + p) == os.path.abspath(__file__)
return p return p