diff options
| author |  netblue30 <netblue30@yahoo.com> | 2016-06-19 06:09:44 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-06-19 06:09:44 -0400 |
| commit | b5f96e4a5947a5f9456b59d72074d5f785d81677 (patch) | |
| tree | 93d4584ccb1fe23408621b86be635cad70ee10c5 | |
| parent | free memory (diff) | |
| parent | fix logged test sequence number (diff) | |
| download | firejail-b5f96e4a5947a5f9456b59d72074d5f785d81677.tar.gz firejail-b5f96e4a5947a5f9456b59d72074d5f785d81677.tar.zst firejail-b5f96e4a5947a5f9456b59d72074d5f785d81677.zip | |
Merge pull request #577 from reinerh/master
noqueue not exposed on older kernels; pfifo_fast is default qdisc
| -rwxr-xr-x | test/network/bandwidth.exp | 2 | ||||
| -rwxr-xr-x | test/utils/seccomp.exp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/network/bandwidth.exp b/test/network/bandwidth.exp index a3dc9b55f..bccb0b9f3 100755 --- a/test/network/bandwidth.exp +++ b/test/network/bandwidth.exp | |||
| @@ -18,7 +18,7 @@ spawn $env(SHELL) | |||
| 18 | send -- "firejail --bandwidth=test status\r" | 18 | send -- "firejail --bandwidth=test status\r" |
| 19 | expect { | 19 | expect { |
| 20 | timeout {puts "TESTING ERROR 1\n";exit} | 20 | timeout {puts "TESTING ERROR 1\n";exit} |
| 21 | "qdisc noqueue 0: dev eth0" | 21 | "qdisc pfifo_fast 0: dev eth0" |
| 22 | } | 22 | } |
| 23 | sleep 1 | 23 | sleep 1 |
| 24 | 24 | ||
diff --git a/test/utils/seccomp.exp b/test/utils/seccomp.exp index a318e39b1..c9726ff21 100755 --- a/test/utils/seccomp.exp +++ b/test/utils/seccomp.exp | |||
| @@ -40,7 +40,7 @@ expect { | |||
| 40 | "bingo2" | 40 | "bingo2" |
| 41 | } | 41 | } |
| 42 | expect { | 42 | expect { |
| 43 | timeout {puts "TESTING ERROR 3\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
| 44 | "Seccomp: 0" | 44 | "Seccomp: 0" |
| 45 | } | 45 | } |
| 46 | after 100 | 46 | after 100 |