Update fix-missing-file test to account for progress dots

Now we have dots (or percentages) when files are being downloaded
these can intermingle with the normal output if they are flushed.

Alter the fix-missing-file test to remove dots from the lines to be
compared, and alter the lines-checked to add in the lines which would
normally be ignored but no longer match due to the missing dots,
e.g. "Downloading packs."

Signed-off-by: Icarus Sparry <icarus.w.sparry@intel.com>
This commit is contained in:
Icarus Sparry
2017-09-28 08:59:49 -07:00
committed by Matthew Johnson
parent 591c08a2d5
commit 397d8758af
2 changed files with 8 additions and 3 deletions
@@ -1,7 +1,12 @@
Attempting to download version string to memory
Downloading packs
Retry #1 downloading subscribed packs
Downloading packs
Retry #2 downloading subscribed packs
Downloading packs
Retry #3 downloading subscribed packs
Installing bundle(s) files...
Downloading packs
Installing bundle(s) files
Path /foo is missing on the file system
Bundle(s) installation done.
Calling post-update helper scripts
Bundle(s) installation done
@@ -24,7 +24,7 @@ teardown() {
run sudo sh -c "$SWUPD bundle-add $SWUPD_OPTS test-bundle"
[ "$status" -eq 0 ]
check_lines "$output"
check_lines "${output//./}"
[ -f "$DIR/target-dir/foo" ]
}