From e8be1f98566d359e57b30402fdc376ed3118d6cc Mon Sep 17 00:00:00 2001
From: Francisco Molina <femolina@uc.cl>
Date: Mon, 16 Mar 2020 11:55:05 +0100
Subject: [PATCH] tests: adapt to test_utils_interactive_sync_shell

---
 tests/periph_gpio/tests/02-bench.py | 3 ---
 tests/ps_schedstatistics/Makefile   | 5 +++++
 tests/test_tools/Makefile           | 4 ++++
 tests/test_tools/tests/01-run.py    | 2 --
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/tests/periph_gpio/tests/02-bench.py b/tests/periph_gpio/tests/02-bench.py
index ea2d00371a..1932e41021 100755
--- a/tests/periph_gpio/tests/02-bench.py
+++ b/tests/periph_gpio/tests/02-bench.py
@@ -15,9 +15,6 @@ TIMEOUT = 30
 
 
 def testfunc(child):
-    child.expect_exact("GPIO peripheral driver test")
-    child.expect_exact(">")
-
     for pin in range(0, 8):
         child.sendline("bench 0 {}".format(pin))
         child.expect(r" *nop loop: +(\d+)us  --- +(\d+\.\d+)us per call  --- +(\d+) calls per sec")
diff --git a/tests/ps_schedstatistics/Makefile b/tests/ps_schedstatistics/Makefile
index ecf853a64a..071a344950 100644
--- a/tests/ps_schedstatistics/Makefile
+++ b/tests/ps_schedstatistics/Makefile
@@ -6,4 +6,9 @@ USEMODULE += ps
 USEMODULE += schedstatistics
 USEMODULE += printf_float
 
+# For this test we don't want to use the shell version of
+# test_utils_interactive_sync, since we want to synchronize before
+# the start of the shell
+DISABLE_MODULE += test_utils_interactive_sync_shell
+
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/test_tools/Makefile b/tests/test_tools/Makefile
index da17abbb2d..b3fece6382 100644
--- a/tests/test_tools/Makefile
+++ b/tests/test_tools/Makefile
@@ -6,4 +6,8 @@ USEMODULE += shell
 # Disable shell echo and prompt to not have them in the way for testing
 CFLAGS += -DSHELL_NO_ECHO=1 -DSHELL_NO_PROMPT=1
 
+# No need for test_utils_interactive_sync in this test since the test
+# synchronizes by itself through `shellping` command.
+DISABLE_MODULE += test_utils_interactive_sync
+
 include $(RIOTBASE)/Makefile.include
diff --git a/tests/test_tools/tests/01-run.py b/tests/test_tools/tests/01-run.py
index ca278074a8..94d057e874 100755
--- a/tests/test_tools/tests/01-run.py
+++ b/tests/test_tools/tests/01-run.py
@@ -64,8 +64,6 @@ def testfunc(child):
     * getting some test output without other messages
     * sending empty lines
     """
-    child.expect_exact("Running 'tests_tools' application")
-
     _wait_shell_ready(child)
 
     # Verify there is no local and remote echo as it is disabled