From 7586503ee20baa8ab9b860e0aab25d9c011e30ab Mon Sep 17 00:00:00 2001 From: Kelvin Fan Date: Wed, 20 Jan 2021 12:04:11 -0500 Subject: [PATCH] vmcheck/test-misc-2: Fix $cursor variable Minor cleanup. Follow up from https://github.com/coreos/rpm-ostree/pull/2461/. --- tests/vmcheck/test-misc-2.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/vmcheck/test-misc-2.sh b/tests/vmcheck/test-misc-2.sh index f8ffb0ba..8a784a78 100755 --- a/tests/vmcheck/test-misc-2.sh +++ b/tests/vmcheck/test-misc-2.sh @@ -53,12 +53,10 @@ if vm_rpmostree finalize-deployment; then elif vm_rpmostree finalize-deployment WRONG_CHECKSUM; then assert_not_reached "finalized with wrong checksum" fi -vm_cmd journalctl --after-cursor "'$from_cursor'" -u rpm-ostreed -o json | jq -r '.AGENT//""' > agent.txt +vm_cmd journalctl --after-cursor "'$cursor'" -u rpm-ostreed -o json | jq -r '.AGENT//""' > agent.txt assert_file_has_content agent.txt testing-agent-id -cursor=$(vm_get_journal_cursor) -vm_cmd journalctl --after-cursor "'$from_cursor'" -u rpm-ostreed -o json | jq -r '.AGENT_SD_UNIT//""' > agent_sd_unit.txt +vm_cmd journalctl --after-cursor "'$cursor'" -u rpm-ostreed -o json | jq -r '.AGENT_SD_UNIT//""' > agent_sd_unit.txt assert_file_has_content agent_sd_unit.txt sshd.service -cursor=$(vm_get_journal_cursor) vm_reboot_cmd rpm-ostree finalize-deployment "${commit}" assert_streq "$(vm_get_booted_csum)" "${commit}" vm_assert_journal_has_content $cursor "Finalized deployment; rebooting into ${commit}"