diff options
author | 2022-02-09 18:04:36 +0100 | |
---|---|---|
committer | 2022-02-09 18:30:45 +0100 | |
commit | 7578e86ef8ddb78da44d426b94def77366627e0e (patch) | |
tree | e752d23f1b61a50fb7b7372d6799fe9ef4d111e4 /test/ssh | |
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/ssh')
-rwxr-xr-x | test/ssh/login.exp | 2 | ||||
-rwxr-xr-x | test/ssh/scp.exp | 4 | ||||
-rwxr-xr-x | test/ssh/sftp.exp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/test/ssh/login.exp b/test/ssh/login.exp index d6ff434b5..5d6a6216b 100755 --- a/test/ssh/login.exp +++ b/test/ssh/login.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "ssh firejail-test@0\r" | 10 | send -- "ssh firejail-test@0\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" {puts "OK\n"} | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "OK\n"} |
14 | "an existing sandbox was detected" {puts "OK\n"} | 14 | "an existing sandbox was detected" {puts "OK\n"} |
15 | } | 15 | } |
16 | sleep 1 | 16 | sleep 1 |
diff --git a/test/ssh/scp.exp b/test/ssh/scp.exp index 2305b8f50..13163564b 100755 --- a/test/ssh/scp.exp +++ b/test/ssh/scp.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "ssh firejail-test@0\r" | 10 | send -- "ssh firejail-test@0\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" {puts "OK\n"} | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "OK\n"} |
14 | "an existing sandbox was detected" {puts "OK\n"} | 14 | "an existing sandbox was detected" {puts "OK\n"} |
15 | } | 15 | } |
16 | sleep 1 | 16 | sleep 1 |
@@ -33,7 +33,7 @@ sleep 1 | |||
33 | send -- "ssh firejail-test@0\r" | 33 | send -- "ssh firejail-test@0\r" |
34 | expect { | 34 | expect { |
35 | timeout {puts "TESTING ERROR 2\n";exit} | 35 | timeout {puts "TESTING ERROR 2\n";exit} |
36 | "Child process initialized" {puts "OK\n"} | 36 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "OK\n"} |
37 | "an existing sandbox was detected" {puts "OK\n"} | 37 | "an existing sandbox was detected" {puts "OK\n"} |
38 | } | 38 | } |
39 | sleep 1 | 39 | sleep 1 |
diff --git a/test/ssh/sftp.exp b/test/ssh/sftp.exp index bc1647b0a..01c1e7e04 100755 --- a/test/ssh/sftp.exp +++ b/test/ssh/sftp.exp | |||
@@ -10,7 +10,7 @@ match_max 100000 | |||
10 | send -- "ssh firejail-test@0\r" | 10 | send -- "ssh firejail-test@0\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "Child process initialized" {puts "OK\n"} | 13 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "OK\n"} |
14 | "an existing sandbox was detected" {puts "OK\n"} | 14 | "an existing sandbox was detected" {puts "OK\n"} |
15 | } | 15 | } |
16 | sleep 1 | 16 | sleep 1 |
@@ -45,7 +45,7 @@ sleep 1 | |||
45 | send -- "ssh firejail-test@0\r" | 45 | send -- "ssh firejail-test@0\r" |
46 | expect { | 46 | expect { |
47 | timeout {puts "TESTING ERROR 4\n";exit} | 47 | timeout {puts "TESTING ERROR 4\n";exit} |
48 | "Child process initialized" {puts "OK\n"} | 48 | -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" {puts "OK\n"} |
49 | "an existing sandbox was detected" {puts "OK\n"} | 49 | "an existing sandbox was detected" {puts "OK\n"} |
50 | } | 50 | } |
51 | sleep 1 | 51 | sleep 1 |