diff options
author | 2022-02-09 18:04:36 +0100 | |
---|---|---|
committer | 2022-02-09 18:30:45 +0100 | |
commit | 7578e86ef8ddb78da44d426b94def77366627e0e (patch) | |
tree | e752d23f1b61a50fb7b7372d6799fe9ef4d111e4 /test/appimage | |
parent | Merge pull request #4915 from kmk3/keepassx-restore-nou2f (diff) | |
download | firejail-7578e86ef8ddb78da44d426b94def77366627e0e.tar.gz firejail-7578e86ef8ddb78da44d426b94def77366627e0e.tar.zst firejail-7578e86ef8ddb78da44d426b94def77366627e0e.zip |
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.
Diffstat (limited to 'test/appimage')
-rwxr-xr-x | test/appimage/appimage-args.exp | 4 | ||||
-rwxr-xr-x | test/appimage/appimage-trace.exp | 4 | ||||
-rwxr-xr-x | test/appimage/appimage-v1.exp | 4 | ||||
-rwxr-xr-x | test/appimage/appimage-v2.exp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/test/appimage/appimage-args.exp b/test/appimage/appimage-args.exp index a65197a52..e1fb8567a 100755 --- a/test/appimage/appimage-args.exp +++ b/test/appimage/appimage-args.exp | |||
@@ -23,7 +23,7 @@ expect { | |||
23 | } | 23 | } |
24 | expect { | 24 | expect { |
25 | timeout {puts "TESTING ERROR 4\n";exit} | 25 | timeout {puts "TESTING ERROR 4\n";exit} |
26 | "Child process initialized" | 26 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
27 | } | 27 | } |
28 | sleep 2 | 28 | sleep 2 |
29 | 29 | ||
@@ -51,7 +51,7 @@ expect { | |||
51 | send -- "firejail --name=blablabla\r" | 51 | send -- "firejail --name=blablabla\r" |
52 | expect { | 52 | expect { |
53 | timeout {puts "TESTING ERROR 7\n";exit} | 53 | timeout {puts "TESTING ERROR 7\n";exit} |
54 | "Child process initialized" | 54 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
55 | } | 55 | } |
56 | sleep 2 | 56 | sleep 2 |
57 | 57 | ||
diff --git a/test/appimage/appimage-trace.exp b/test/appimage/appimage-trace.exp index dfd2aaf9b..d1530349e 100755 --- a/test/appimage/appimage-trace.exp +++ b/test/appimage/appimage-trace.exp | |||
@@ -11,7 +11,7 @@ set appimage_id $spawn_id | |||
11 | send -- "firejail --trace --timeout=00:00:05 --appimage Leafpad-0.8.17-x86_64.AppImage\r" | 11 | send -- "firejail --trace --timeout=00:00:05 --appimage Leafpad-0.8.17-x86_64.AppImage\r" |
12 | expect { | 12 | expect { |
13 | timeout {puts "TESTING ERROR 1\n";exit} | 13 | timeout {puts "TESTING ERROR 1\n";exit} |
14 | "Child process initialized" | 14 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
15 | } | 15 | } |
16 | expect { | 16 | expect { |
17 | timeout {puts "TESTING ERROR 2\n";exit} | 17 | timeout {puts "TESTING ERROR 2\n";exit} |
@@ -38,7 +38,7 @@ sleep 1 | |||
38 | send -- "firejail --trace --timeout=00:00:05 --appimage Leafpad-0.8.18.1.glibc2.4-x86_64.AppImage\r" | 38 | send -- "firejail --trace --timeout=00:00:05 --appimage Leafpad-0.8.18.1.glibc2.4-x86_64.AppImage\r" |
39 | expect { | 39 | expect { |
40 | timeout {puts "TESTING ERROR 11\n";exit} | 40 | timeout {puts "TESTING ERROR 11\n";exit} |
41 | "Child process initialized" | 41 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
42 | } | 42 | } |
43 | expect { | 43 | expect { |
44 | timeout {puts "TESTING ERROR 12\n";exit} | 44 | timeout {puts "TESTING ERROR 12\n";exit} |
diff --git a/test/appimage/appimage-v1.exp b/test/appimage/appimage-v1.exp index 0fc4ad0f0..2fcccfd5b 100755 --- a/test/appimage/appimage-v1.exp +++ b/test/appimage/appimage-v1.exp | |||
@@ -11,7 +11,7 @@ set appimage_id $spawn_id | |||
11 | send -- "firejail --name=appimage-test --debug --appimage Leafpad-0.8.17-x86_64.AppImage\r" | 11 | send -- "firejail --name=appimage-test --debug --appimage Leafpad-0.8.17-x86_64.AppImage\r" |
12 | expect { | 12 | expect { |
13 | timeout {puts "TESTING ERROR 1\n";exit} | 13 | timeout {puts "TESTING ERROR 1\n";exit} |
14 | "Child process initialized" | 14 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
15 | } | 15 | } |
16 | sleep 2 | 16 | sleep 2 |
17 | 17 | ||
@@ -39,7 +39,7 @@ expect { | |||
39 | send -- "firejail --name=blablabla\r" | 39 | send -- "firejail --name=blablabla\r" |
40 | expect { | 40 | expect { |
41 | timeout {puts "TESTING ERROR 4\n";exit} | 41 | timeout {puts "TESTING ERROR 4\n";exit} |
42 | "Child process initialized" | 42 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
43 | } | 43 | } |
44 | sleep 2 | 44 | sleep 2 |
45 | 45 | ||
diff --git a/test/appimage/appimage-v2.exp b/test/appimage/appimage-v2.exp index 8f61de6e9..d289165d9 100755 --- a/test/appimage/appimage-v2.exp +++ b/test/appimage/appimage-v2.exp | |||
@@ -11,7 +11,7 @@ set appimage_id $spawn_id | |||
11 | send -- "firejail --name=appimage-test --appimage Leafpad-0.8.18.1.glibc2.4-x86_64.AppImage\r" | 11 | send -- "firejail --name=appimage-test --appimage Leafpad-0.8.18.1.glibc2.4-x86_64.AppImage\r" |
12 | expect { | 12 | expect { |
13 | timeout {puts "TESTING ERROR 1\n";exit} | 13 | timeout {puts "TESTING ERROR 1\n";exit} |
14 | "Child process initialized" | 14 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
15 | } | 15 | } |
16 | sleep 2 | 16 | sleep 2 |
17 | 17 | ||
@@ -39,7 +39,7 @@ expect { | |||
39 | send -- "firejail --name=blablabla\r" | 39 | send -- "firejail --name=blablabla\r" |
40 | expect { | 40 | expect { |
41 | timeout {puts "TESTING ERROR 4\n";exit} | 41 | timeout {puts "TESTING ERROR 4\n";exit} |
42 | "Child process initialized" | 42 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" |
43 | } | 43 | } |
44 | sleep 2 | 44 | sleep 2 |
45 | 45 | ||