From c65495749f62b7cbd153d98ca6519d2f26142433 Mon Sep 17 00:00:00 2001
From: Sebastian Sumpf <sebastian.sumpf@genode-labs.com>
Date: Mon, 9 Mar 2020 08:21:21 +0100
Subject: [PATCH] os: adjust tests to changed output of block client

issue #3671
---
 repos/os/recipes/pkg/test-block/runtime          | 2 +-
 repos/os/recipes/pkg/test-block_cache/runtime    | 2 +-
 repos/os/recipes/pkg/test-part_block_gpt/runtime | 4 ++--
 repos/os/recipes/pkg/test-part_block_mbr/runtime | 6 +++---
 repos/os/run/ahci_block.run                      | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/repos/os/recipes/pkg/test-block/runtime b/repos/os/recipes/pkg/test-block/runtime
index 72b1370ce..3f659b06c 100644
--- a/repos/os/recipes/pkg/test-block/runtime
+++ b/repos/os/recipes/pkg/test-block/runtime
@@ -4,7 +4,7 @@
 
 	<events>
 		<timeout meaning="failed" sec="20" />
-		<log meaning="succeeded">Tests finished successfully</log>
+		<log meaning="succeeded">--- all tests finished ---</log>
 		<log meaning="failed">test-block-client] Error: </log>
 	</events>
 
diff --git a/repos/os/recipes/pkg/test-block_cache/runtime b/repos/os/recipes/pkg/test-block_cache/runtime
index dd7386884..79a7d42a5 100644
--- a/repos/os/recipes/pkg/test-block_cache/runtime
+++ b/repos/os/recipes/pkg/test-block_cache/runtime
@@ -4,7 +4,7 @@
 
 	<events>
 		<timeout meaning="failed" sec="20" />
-		<log meaning="succeeded">Tests finished successfully</log>
+		<log meaning="succeeded">--- all tests finished ---</log>
 		<log meaning="failed">test-block-client] Error: </log>
 	</events>
 
diff --git a/repos/os/recipes/pkg/test-part_block_gpt/runtime b/repos/os/recipes/pkg/test-part_block_gpt/runtime
index 1c0f53429..ad304b5c5 100644
--- a/repos/os/recipes/pkg/test-part_block_gpt/runtime
+++ b/repos/os/recipes/pkg/test-part_block_gpt/runtime
@@ -5,8 +5,8 @@
 	<events>
 		<timeout meaning="failed" sec="70" />
 		<log meaning="succeeded">
-			Tests finished successfully!*
-			Tests finished successfully!
+			--- all tests finished ---*
+			--- all tests finished ---
 		</log>
 		<log meaning="failed">Error: </log>
 	</events>
diff --git a/repos/os/recipes/pkg/test-part_block_mbr/runtime b/repos/os/recipes/pkg/test-part_block_mbr/runtime
index 5a7528425..3b13fa069 100644
--- a/repos/os/recipes/pkg/test-part_block_mbr/runtime
+++ b/repos/os/recipes/pkg/test-part_block_mbr/runtime
@@ -5,9 +5,9 @@
 	<events>
 		<timeout meaning="failed" sec="60" />
 		<log meaning="succeeded">
-			Tests finished successfully!*
-			Tests finished successfully!*
-			Tests finished successfully!
+			--- all tests finished ---*
+			--- all tests finished ---*
+			--- all tests finished ---
 		</log>
 		<log meaning="failed">Error: </log>
 	</events>
diff --git a/repos/os/run/ahci_block.run b/repos/os/run/ahci_block.run
index 3fbb15f9c..91e6ace74 100644
--- a/repos/os/run/ahci_block.run
+++ b/repos/os/run/ahci_block.run
@@ -107,7 +107,7 @@ append qemu_args " -nographic -device ahci,id=ahci -boot d "
 append qemu_args " -drive id=disk,file=bin/ext2.raw,format=raw,if=none             -device ide-hd,drive=disk,bus=ahci.0 "
 append qemu_args " -drive id=cd,file=[run_dir]/../ahci_block.iso,if=none,media=cdrom -device ide-cd,drive=cd,bus=ahci.1 "
 
-run_genode_until "Tests finished successfully!" 100
-run_genode_until "Tests finished successfully!" 100 [output_spawn_id]
+run_genode_until "--- all tests finished ---" 100
+run_genode_until "--- all tests finished ---" 100 [output_spawn_id]
 
 exec rm -f bin/ext2.raw