From d04e3056ae249586d7092c785b2f05a865af09aa Mon Sep 17 00:00:00 2001
From: Denis Pynkin <denis.pynkin@collabora.com>
Date: Wed, 1 May 2019 12:31:42 +0300
Subject: [PATCH] Actualized the manual rollback test

Removed the mention of 'update_available' U-Boot variable -- we do not
use environment-based rollback driver anymore.
Updated the output for blacklisted part -- now we have additional
information about Collection ID.

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>
---
 test-cases/apertis-update-manager-rollback.yaml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/test-cases/apertis-update-manager-rollback.yaml b/test-cases/apertis-update-manager-rollback.yaml
index 5b082fb..23aef6d 100644
--- a/test-cases/apertis-update-manager-rollback.yaml
+++ b/test-cases/apertis-update-manager-rollback.yaml
@@ -64,11 +64,10 @@ run:
     - $ sudo ostree admin status
     - $ sudo reboot
     - "In `U-Boot` console check the status of upgrade"
-    - $ printenv bootcount bootlimit upgrade_available
+    - $ printenv bootcount bootlimit
     - |
         >bootcount=1
         bootlimit=3
-        upgrade_available=1
     - "Restart the device by pressing the restart button before the boot finishes."
     - "Restart the device a second time by pressing the restart button before the boot finishes."
     - "Restart the device a third time by pressing the restart button before the boot finishes."
@@ -89,12 +88,14 @@ run:
     - "Plug the USB flash drive with the same update file into the device"
     - "Check that the user interface agent reports the system is up to update"
     - |
-        >** Message: Upgrade status: Checking
-        ** Message: System is up to date
+        >** Message: 09:21:45.026: Upgrade status: Checking
+        ** Message: 09:21:45.300: System is up to date
     - "Check the journal log should mention that the update ID has been blacklisted"
     - $ sudo journalctl -ef --unit apertis-update-manager
     - |
-        >Dec 19 20:54:34 apertis apertis-update-[330]: Ostree static delta starting
-        Dec 19 20:54:34 apertis apertis-update-[330]: Revision '9804c4f6e952f0ba61659f55262b9cdd8879cb480084e7f24d9167c2b35f7f28' is marked as blacklisted; skipping
-        Dec 19 20:54:34 apertis apertis-update-[330]: Ostree already up to date
+        >May 01 09:21:45 apertis apertis-update-[363]: mount added : /media/APERTIS
+        May 01 09:21:45 apertis apertis-update-[363]: Ostree static delta starting
+        May 01 09:21:45 apertis apertis-update-[363]: Metadata read from commit '710dbec2943510e4deb279cd6738a4a1a5b589eb6c4976e486d056e0308a02e1': {'ostree.ref-binding': <['apertis/v2019pre/armhf-uboot/minimal']>, 'ostree.collection-binding': <'org.apertis.os'>}
+        May 01 09:21:45 apertis apertis-update-[363]: Revision '710dbec2943510e4deb279cd6738a4a1a5b589eb6c4976e486d056e0308a02e1' is marked as blacklisted; skipping
+        May 01 09:21:45 apertis apertis-update-[363]: Ostree already up to date
 
-- 
GitLab