From 2cae37ca40886c8edaf524406ad61ab1b92aff3d Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 15 May 2018 16:39:43 +0200 Subject: [PATCH] clients/tests: test nmcli output for active-connection state DEACTIVATING --- Makefile.am | 27 ++++ .../test_003-053.expected | 16 +++ .../test_003-054.expected | 16 +++ .../test_003-055.expected | 16 +++ .../test_003-056.expected | 16 +++ .../test_003-057.expected | 16 +++ .../test_003-058.expected | 16 +++ .../test_003-059.expected | 18 +++ .../test_003-060.expected | 18 +++ .../test_003-061.expected | 18 +++ .../test_003-062.expected | 18 +++ .../test_003-063.expected | 18 +++ .../test_003-064.expected | 18 +++ .../test_003-065.expected | 24 ++++ .../test_003-066.expected | 24 ++++ .../test_003-067.expected | 24 ++++ .../test_003-068.expected | 16 +++ .../test_003-069.expected | 16 +++ .../test_003-070.expected | 16 +++ .../test_003-071.expected | 15 +++ .../test_003-072.expected | 15 +++ .../test_003-073.expected | 15 +++ .../test_003-074.expected | 20 +++ .../test_003-075.expected | 20 +++ .../test_003-076.expected | 20 +++ .../test_003-077.expected | 115 ++++++++++++++++++ .../test_003-078.expected | 115 ++++++++++++++++++ .../test_003-079.expected | 115 ++++++++++++++++++ clients/tests/test-client.py | 32 +++++ 29 files changed, 833 insertions(+) create mode 100644 clients/tests/test-client.check-on-disk/test_003-053.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-054.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-055.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-056.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-057.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-058.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-059.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-060.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-061.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-062.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-063.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-064.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-065.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-066.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-067.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-068.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-069.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-070.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-071.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-072.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-073.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-074.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-075.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-076.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-077.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-078.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-079.expected diff --git a/Makefile.am b/Makefile.am index c4430e208..58f87e40b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3907,6 +3907,33 @@ EXTRA_DIST += \ clients/tests/test-client.check-on-disk/test_003-050.expected \ clients/tests/test-client.check-on-disk/test_003-051.expected \ clients/tests/test-client.check-on-disk/test_003-052.expected \ + clients/tests/test-client.check-on-disk/test_003-053.expected \ + clients/tests/test-client.check-on-disk/test_003-054.expected \ + clients/tests/test-client.check-on-disk/test_003-055.expected \ + clients/tests/test-client.check-on-disk/test_003-056.expected \ + clients/tests/test-client.check-on-disk/test_003-057.expected \ + clients/tests/test-client.check-on-disk/test_003-058.expected \ + clients/tests/test-client.check-on-disk/test_003-059.expected \ + clients/tests/test-client.check-on-disk/test_003-060.expected \ + clients/tests/test-client.check-on-disk/test_003-061.expected \ + clients/tests/test-client.check-on-disk/test_003-062.expected \ + clients/tests/test-client.check-on-disk/test_003-063.expected \ + clients/tests/test-client.check-on-disk/test_003-064.expected \ + clients/tests/test-client.check-on-disk/test_003-065.expected \ + clients/tests/test-client.check-on-disk/test_003-066.expected \ + clients/tests/test-client.check-on-disk/test_003-067.expected \ + clients/tests/test-client.check-on-disk/test_003-068.expected \ + clients/tests/test-client.check-on-disk/test_003-069.expected \ + clients/tests/test-client.check-on-disk/test_003-070.expected \ + clients/tests/test-client.check-on-disk/test_003-071.expected \ + clients/tests/test-client.check-on-disk/test_003-072.expected \ + clients/tests/test-client.check-on-disk/test_003-073.expected \ + clients/tests/test-client.check-on-disk/test_003-074.expected \ + clients/tests/test-client.check-on-disk/test_003-075.expected \ + clients/tests/test-client.check-on-disk/test_003-076.expected \ + clients/tests/test-client.check-on-disk/test_003-077.expected \ + clients/tests/test-client.check-on-disk/test_003-078.expected \ + clients/tests/test-client.check-on-disk/test_003-079.expected \ \ $(NULL) diff --git a/clients/tests/test-client.check-on-disk/test_003-053.expected b/clients/tests/test-client.check-on-disk/test_003-053.expected new file mode 100644 index 000000000..29e924471 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-053.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:671:test_003()/53 +cmd: $NMCLI -f ALL con +lang: C +returncode: 0 +stdout: 1096 bytes +>>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-054.expected b/clients/tests/test-client.check-on-disk/test_003-054.expected new file mode 100644 index 000000000..9e8aefe3d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-054.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:671:test_003()/54 +cmd: $NMCLI -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1104 bytes +>>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-055.expected b/clients/tests/test-client.check-on-disk/test_003-055.expected new file mode 100644 index 000000000..d0389db70 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-055.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:671:test_003()/55 +cmd: $NMCLI -f ALL con +lang: de_DE.utf8 +returncode: 0 +stdout: 1112 bytes +>>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nie ja 0 nein /org/freedesktop/NetworkManager/Settings/Connection/3 ja eth0 wird deaktiviert /org/freedesktop/NetworkManager/ActiveConnection/1 -- +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nie ja 0 nein /org/freedesktop/NetworkManager/Settings/Connection/1 nein -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nie ja 0 nein /org/freedesktop/NetworkManager/Settings/Connection/2 nein -- -- -- -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-056.expected b/clients/tests/test-client.check-on-disk/test_003-056.expected new file mode 100644 index 000000000..647867b9c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-056.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:674:test_003()/56 +cmd: $NMCLI -f UUID,TYPE con +lang: C +returncode: 0 +stdout: 192 bytes +>>> +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-057.expected b/clients/tests/test-client.check-on-disk/test_003-057.expected new file mode 100644 index 000000000..c9825577a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-057.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:674:test_003()/57 +cmd: $NMCLI -f UUID,TYPE con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 192 bytes +>>> +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-058.expected b/clients/tests/test-client.check-on-disk/test_003-058.expected new file mode 100644 index 000000000..3ae660bef --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-058.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:674:test_003()/58 +cmd: $NMCLI -f UUID,TYPE con +lang: de_DE.utf8 +returncode: 0 +stdout: 192 bytes +>>> +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-059.expected b/clients/tests/test-client.check-on-disk/test_003-059.expected new file mode 100644 index 000000000..d0eb8fd02 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-059.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:677:test_003()/59 +cmd: $NMCLI -f UUID,TYPE --mode multiline con +lang: C +returncode: 0 +stdout: 378 bytes +>>> +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-060.expected b/clients/tests/test-client.check-on-disk/test_003-060.expected new file mode 100644 index 000000000..428b5352a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-060.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:677:test_003()/60 +cmd: $NMCLI -f UUID,TYPE --mode multiline con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 378 bytes +>>> +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-061.expected b/clients/tests/test-client.check-on-disk/test_003-061.expected new file mode 100644 index 000000000..d83c21b6b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-061.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:677:test_003()/61 +cmd: $NMCLI -f UUID,TYPE --mode multiline con +lang: de_DE.utf8 +returncode: 0 +stdout: 378 bytes +>>> +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-062.expected b/clients/tests/test-client.check-on-disk/test_003-062.expected new file mode 100644 index 000000000..6df46f617 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-062.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:680:test_003()/62 +cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con +lang: C +returncode: 0 +stdout: 186 bytes +>>> +UUID:UUID-ethernet-REPLACED-REPLACED-REPL +TYPE:802-3-ethernet +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-063.expected b/clients/tests/test-client.check-on-disk/test_003-063.expected new file mode 100644 index 000000000..068fab1f5 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-063.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:680:test_003()/63 +cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 186 bytes +>>> +UUID:UUID-ethernet-REPLACED-REPLACED-REPL +TYPE:802-3-ethernet +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-064.expected b/clients/tests/test-client.check-on-disk/test_003-064.expected new file mode 100644 index 000000000..054e6619c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-064.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:680:test_003()/64 +cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con +lang: de_DE.utf8 +returncode: 0 +stdout: 186 bytes +>>> +UUID:UUID-ethernet-REPLACED-REPLACED-REPL +TYPE:802-3-ethernet +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-065.expected b/clients/tests/test-client.check-on-disk/test_003-065.expected new file mode 100644 index 000000000..a7d991d85 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-065.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:683:test_003()/65 +cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con +lang: C +returncode: 0 +stdout: 835 bytes +>>> +=============================================================================== + NetworkManager connection profiles +=============================================================================== +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-066.expected b/clients/tests/test-client.check-on-disk/test_003-066.expected new file mode 100644 index 000000000..fd53d6671 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-066.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:683:test_003()/66 +cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 841 bytes +>>> +=============================================================================== + Profile połączeń usługi NetworkManager +=============================================================================== +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-067.expected b/clients/tests/test-client.check-on-disk/test_003-067.expected new file mode 100644 index 000000000..d22b8582d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-067.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:683:test_003()/67 +cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con +lang: de_DE.utf8 +returncode: 0 +stdout: 835 bytes +>>> +=============================================================================== + NetworkManager Verbindungsprofile +=============================================================================== +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-068.expected b/clients/tests/test-client.check-on-disk/test_003-068.expected new file mode 100644 index 000000000..2e303c963 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-068.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:686:test_003()/68 +cmd: $NMCLI -f UUID,TYPE --mode tabular con +lang: C +returncode: 0 +stdout: 192 bytes +>>> +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-069.expected b/clients/tests/test-client.check-on-disk/test_003-069.expected new file mode 100644 index 000000000..9f637a8c6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-069.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:686:test_003()/69 +cmd: $NMCLI -f UUID,TYPE --mode tabular con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 192 bytes +>>> +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-070.expected b/clients/tests/test-client.check-on-disk/test_003-070.expected new file mode 100644 index 000000000..3ca3df604 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-070.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:686:test_003()/70 +cmd: $NMCLI -f UUID,TYPE --mode tabular con +lang: de_DE.utf8 +returncode: 0 +stdout: 192 bytes +>>> +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-071.expected b/clients/tests/test-client.check-on-disk/test_003-071.expected new file mode 100644 index 000000000..894b8fb1f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-071.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:689:test_003()/71 +cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con +lang: C +returncode: 0 +stdout: 156 bytes +>>> +UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-072.expected b/clients/tests/test-client.check-on-disk/test_003-072.expected new file mode 100644 index 000000000..63fb19a8e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-072.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:689:test_003()/72 +cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 156 bytes +>>> +UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-073.expected b/clients/tests/test-client.check-on-disk/test_003-073.expected new file mode 100644 index 000000000..baa537e95 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-073.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:689:test_003()/73 +cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con +lang: de_DE.utf8 +returncode: 0 +stdout: 156 bytes +>>> +UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-074.expected b/clients/tests/test-client.check-on-disk/test_003-074.expected new file mode 100644 index 000000000..79b5361f8 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-074.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:692:test_003()/74 +cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +lang: C +returncode: 0 +stdout: 394 bytes +>>> +====================================== + NetworkManager connection profiles +====================================== +UUID TYPE +-------------------------------------------------------------------------------------- +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-075.expected b/clients/tests/test-client.check-on-disk/test_003-075.expected new file mode 100644 index 000000000..b04e47553 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-075.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:692:test_003()/75 +cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 414 bytes +>>> +========================================== + Profile połączeń usługi NetworkManager +========================================== +UUID TYPE +------------------------------------------------------------------------------------------ +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-076.expected b/clients/tests/test-client.check-on-disk/test_003-076.expected new file mode 100644 index 000000000..be7003461 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-076.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:692:test_003()/76 +cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +lang: de_DE.utf8 +returncode: 0 +stdout: 390 bytes +>>> +===================================== + NetworkManager Verbindungsprofile +===================================== +UUID TYPE +------------------------------------------------------------------------------------- +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-077.expected b/clients/tests/test-client.check-on-disk/test_003-077.expected new file mode 100644 index 000000000..6b0213b49 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-077.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:695:test_003()/77 +cmd: $NMCLI con s ethernet +lang: C +returncode: 0 +stdout: 4848 bytes +>>> +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: no +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: deactivating +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth1 +GENERAL.STATE: activated +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-078.expected b/clients/tests/test-client.check-on-disk/test_003-078.expected new file mode 100644 index 000000000..d8df8f8ce --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-078.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:695:test_003()/78 +cmd: $NMCLI con s ethernet +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4872 bytes +>>> +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nie +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: automatyczne +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: deactivating +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth1 +GENERAL.STATE: activated +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-079.expected b/clients/tests/test-client.check-on-disk/test_003-079.expected new file mode 100644 index 000000000..a73b5f810 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-079.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:695:test_003()/79 +cmd: $NMCLI con s ethernet +lang: de_DE.utf8 +returncode: 0 +stdout: 4875 bytes +>>> +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: ja +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nein +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unbekannt +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nein +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nein +ipv4.ignore-auto-dns: nein +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: ja +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nein +ipv4.may-fail: ja +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nein +ipv6.ignore-auto-dns: nein +ipv6.never-default: nein +ipv6.may-fail: ja +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: ja +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nein +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: deactivating +GENERAL.DEFAULT: nein +GENERAL.DEFAULT6: nein +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nein +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth1 +GENERAL.STATE: activated +GENERAL.DEFAULT: nein +GENERAL.DEFAULT6: nein +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nein +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index 7e37da234..a64d67882 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -663,6 +663,38 @@ class TestNmcli(NmTestBase): self.call_nmcli_l(['-f', 'ALL', 'dev', 'show', 'eth0'], replace_stdout = replace_stdout) + self.srv.setProperty('/org/freedesktop/NetworkManager/ActiveConnection/1', + 'State', + dbus.UInt32(NM.ActiveConnectionState.DEACTIVATING)) + + self.call_nmcli_l(['-f', 'ALL', 'con'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'UUID,TYPE', 'con'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'multiline', 'con'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'multiline', '--terse', 'con'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'multiline', '--pretty', 'con'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'tabular', 'con'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'tabular', '--terse', 'con'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'tabular', '--pretty', 'con'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['con', 's', 'ethernet'], + replace_stdout = replace_stdout) + + ############################################################################### def main():