test/test_mark: assert boot status changes actually happen

Verify the pre- and post-conditions.

To check that 'mark-active' actually has an effect, add 'other' to mark
the 'bad' slot 'good'/active.

Signed-off-by: Enrico Joerns <[email protected]>

test/test_mark.py

@@ -1,5 +1,8 @@
+import json
+
 from conftest import have_grub, no_service
 from helper import run
+from helper import slot_data_from_json
 
 
 @no_service
@@ -60,23 +63,73 @@ def test_status_mark_good_non_bootslot(rauc_no_service):
 
 @have_grub
 def test_status_mark_good_dbus(rauc_dbus_service_with_system):
+    out, err, exitcode = run("rauc status --output-format=json-pretty")
+    assert exitcode == 0
+    status_data = json.loads(out)
+
+    assert slot_data_from_json(status_data, "rootfs.0")["boot_status"] == "good"
+    assert slot_data_from_json(status_data, "rootfs.1")["boot_status"] == "bad"
+
     out, err, exitcode = run("rauc status mark-good")
 
     assert exitcode == 0
     assert "marked slot rootfs.0 as good" in out
 
+    out, err, exitcode = run("rauc status --output-format=json-pretty")
+    assert exitcode == 0
+    status_data = json.loads(out)
+
+    assert slot_data_from_json(status_data, "rootfs.0")["boot_status"] == "good"
+    assert slot_data_from_json(status_data, "rootfs.1")["boot_status"] == "bad"
+
 
 @have_grub
 def test_status_mark_bad_dbus(rauc_dbus_service_with_system):
+    # check pre-condition
+    out, err, exitcode = run("rauc status --output-format=json-pretty")
+    assert exitcode == 0
+    status_data = json.loads(out)
+
+    assert slot_data_from_json(status_data, "rootfs.0")["boot_status"] == "good"
+    assert slot_data_from_json(status_data, "rootfs.1")["boot_status"] == "bad"
+
+    # mark bad
     out, err, exitcode = run("rauc status mark-bad")
 
     assert exitcode == 0
     assert "marked slot rootfs.0 as bad" in out
 
+    # check post-condition
+    out, err, exitcode = run("rauc status --output-format=json-pretty")
+    assert exitcode == 0
+    status_data = json.loads(out)
+
+    assert slot_data_from_json(status_data, "rootfs.0")["boot_status"] == "bad"
+    assert slot_data_from_json(status_data, "rootfs.1")["boot_status"] == "bad"
+
 
 @have_grub
 def test_status_mark_active_dbus(rauc_dbus_service_with_system):
-    out, err, exitcode = run("rauc status mark-active")
+    # check pre-condition
+    out, err, exitcode = run("rauc status --output-format=json-pretty")
+    assert exitcode == 0
+    status_data = json.loads(out)
+
+    assert slot_data_from_json(status_data, "rootfs.0")["boot_status"] == "good"
+    assert slot_data_from_json(status_data, "rootfs.1")["boot_status"] == "bad"
+    assert status_data["boot_primary"] == "rootfs.0"
 
+    # mark active other
+    out, err, exitcode = run("rauc status mark-active other")
+
+    assert exitcode == 0
+    assert "activated slot rootfs.1" in out
+
+    # check post-condition
+    out, err, exitcode = run("rauc status --output-format=json-pretty")
     assert exitcode == 0
-    assert "activated slot rootfs.0" in out
+    status_data = json.loads(out)
+
+    assert slot_data_from_json(status_data, "rootfs.0")["boot_status"] == "good"
+    assert slot_data_from_json(status_data, "rootfs.1")["boot_status"] == "good"
+    assert status_data["boot_primary"] == "rootfs.1"