diff options
| author | Íñigo Huguet <ihuguet@redhat.com> | 2023-10-09 14:06:45 +0200 |
|---|---|---|
| committer | Íñigo Huguet <ihuguet@redhat.com> | 2023-10-18 08:13:22 +0200 |
| commit | 123ca26770306b8fd3fbfd47c3c43a40f7a36cfb (patch) | |
| tree | 72b4ef94eb8edf195819c9b8960d28f0d6e74e8f | |
| parent | 81fdd4da3aca1fb1f49d4a2b9aef24c935b012df (diff) | |
nmcli: don't warn version mismatch with daemon not runningih/nmcli_warn_check_running
Fixes: fb851f3294fb ('nmcli: warn if daemon version mismatch')
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1750
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | src/nmcli/utils.c | 3 | ||||
| -rw-r--r-- | src/tests/client/test-client.check-on-disk/test_daemon_not_running.expected | 10 | ||||
| -rwxr-xr-x | src/tests/client/test-client.py | 4 |
4 files changed, 18 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 31fdf65e4f..fbad8e2b60 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5526,6 +5526,7 @@ EXTRA_DIST += \ src/tests/client/test-client.check-on-disk/test_004.expected \ src/tests/client/test-client.check-on-disk/test_offline.expected \ src/tests/client/test-client.check-on-disk/test_version_warn.expected \ + src/tests/client/test-client.check-on-disk/test_daemon_not_running.expected \ \ src/tests/client/meson.build \ $(NULL) diff --git a/src/nmcli/utils.c b/src/nmcli/utils.c index 29e84cc25c..615d1f8656 100644 --- a/src/nmcli/utils.c +++ b/src/nmcli/utils.c @@ -1830,6 +1830,9 @@ nmc_warn_if_version_mismatch(NMClient *client) g_return_if_fail(client != NULL); + if (!nm_client_get_nm_running(client)) + return; + nm_ver = nm_client_get_version(client); if (!nm_streq0(nm_ver, VERSION)) { g_printerr(_("Warning: nmcli (%s) and NetworkManager (%s) versions don't match. " diff --git a/src/tests/client/test-client.check-on-disk/test_daemon_not_running.expected b/src/tests/client/test-client.check-on-disk/test_daemon_not_running.expected new file mode 100644 index 0000000000..14f7c1de0b --- /dev/null +++ b/src/tests/client/test-client.check-on-disk/test_daemon_not_running.expected @@ -0,0 +1,10 @@ +size: 170 +location: src/tests/client/test-client.py:test_daemon_not_running()/1 +cmd: $NMCLI c +lang: C +returncode: 8 +stderr: 38 bytes +>>> +Error: NetworkManager is not running. + +<<< diff --git a/src/tests/client/test-client.py b/src/tests/client/test-client.py index ca9ade0bd7..e313a7d63a 100755 --- a/src/tests/client/test-client.py +++ b/src/tests/client/test-client.py @@ -2269,6 +2269,10 @@ class TestNmcli(unittest.TestCase): ], ) + @nm_test_no_dbus + def test_daemon_not_running(self): + self.call_nmcli(["c"]) + ############################################################################### |