From 7578e86ef8ddb78da44d426b94def77366627e0e Mon Sep 17 00:00:00 2001 From: smitsohu Date: Wed, 9 Feb 2022 18:04:36 +0100 Subject: testing: fix expect matching of numbers The sandbox timestamp should not be available for matching when output is already expected from the next command (this is only a problem if numeric output if expected from the first command in the sandbox). A possible alternative would be to flush the expect output buffer with 'expect "*"' after the sandbox is up. --- test/apps-x11-xorg/firefox.exp | 2 +- test/apps-x11-xorg/thunderbird.exp | 2 +- test/apps-x11-xorg/transmission-gtk.exp | 2 +- test/apps-x11-xorg/transmission-qt.exp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'test/apps-x11-xorg') diff --git a/test/apps-x11-xorg/firefox.exp b/test/apps-x11-xorg/firefox.exp index 23c5d4675..4a85b593b 100755 --- a/test/apps-x11-xorg/firefox.exp +++ b/test/apps-x11-xorg/firefox.exp @@ -36,7 +36,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps-x11-xorg/thunderbird.exp b/test/apps-x11-xorg/thunderbird.exp index ede339cbe..a06303fc5 100755 --- a/test/apps-x11-xorg/thunderbird.exp +++ b/test/apps-x11-xorg/thunderbird.exp @@ -33,7 +33,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps-x11-xorg/transmission-gtk.exp b/test/apps-x11-xorg/transmission-gtk.exp index 0b7d87b07..3e497f9e0 100755 --- a/test/apps-x11-xorg/transmission-gtk.exp +++ b/test/apps-x11-xorg/transmission-gtk.exp @@ -33,7 +33,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 diff --git a/test/apps-x11-xorg/transmission-qt.exp b/test/apps-x11-xorg/transmission-qt.exp index ef036b569..0642d3d32 100755 --- a/test/apps-x11-xorg/transmission-qt.exp +++ b/test/apps-x11-xorg/transmission-qt.exp @@ -33,7 +33,7 @@ expect { send -- "firejail --name=blablabla\r" expect { timeout {puts "TESTING ERROR 4\n";exit} - "Child process initialized" + -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" } sleep 2 -- cgit v1.2.3-54-g00ecf