From da918d0712d2152bf466514627bf7040ac3ffa8a Mon Sep 17 00:00:00 2001 From: Till Maas Date: Mon, 11 May 2020 17:30:51 +0200 Subject: [PATCH] Tests: Use busctl instead of gdbus Systemd ships with busctl that can be used instead of gdbus. Use it to reduce test dependencies. --- tests/playbooks/tests_checkpoint_cleanup.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/playbooks/tests_checkpoint_cleanup.yml b/tests/playbooks/tests_checkpoint_cleanup.yml index 8678d2b..8a4cc07 100644 --- a/tests/playbooks/tests_checkpoint_cleanup.yml +++ b/tests/playbooks/tests_checkpoint_cleanup.yml @@ -54,14 +54,16 @@ dropped. that: error_trigger.failed # yamllint disable-line rule:line-length - - command: gdbus introspect --system --dest org.freedesktop.NetworkManager --object-path /org/freedesktop/NetworkManager/Checkpoint --recurse - register: checkpoints + - command: busctl --system tree --list org.freedesktop.NetworkManager + register: nm_dbus_objects - debug: - var: checkpoints + var: nm_dbus_objects - name: Assert that no checkpoints are left assert: fail_msg: Checkpoints not cleaned up - that: checkpoints.stdout_lines | length == 2 + that: > + '/org/freedesktop/NetworkManager/Checkpoint/' not in + nm_dbus_objects.stdout_lines always: - block: # Use internal module directly for speedup