diff options
| author |  netblue30 <netblue30@yahoo.com> | 2020-08-14 06:42:22 -0400 |
|---|---|---|
| committer | netblue30 <netblue30@yahoo.com> | 2020-08-14 06:42:22 -0400 |
| commit | 8263c47038b498fb3d3fdf80e1da186637c6b8ad (patch) | |
| tree | cb65ed4c2917fcde26bb77cc903330992d755244 /test/environment | |
| parent | AppArmor fix (diff) | |
| parent | tests: fix check for modules directory (diff) | |
| download | firejail-8263c47038b498fb3d3fdf80e1da186637c6b8ad.tar.gz firejail-8263c47038b498fb3d3fdf80e1da186637c6b8ad.tar.zst firejail-8263c47038b498fb3d3fdf80e1da186637c6b8ad.zip | |
Merge branch 'release-0.9.62' of https://github.com/netblue30/firejail into release-0.9.62
Diffstat (limited to 'test/environment')
| -rwxr-xr-x | test/environment/rlimit-profile.exp | 2 | ||||
| -rwxr-xr-x | test/environment/rlimit.exp | 4 | ||||
| -rw-r--r-- | test/environment/rlimit.profile | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/test/environment/rlimit-profile.exp b/test/environment/rlimit-profile.exp index 43d6a3ee0..33eb0b3fd 100755 --- a/test/environment/rlimit-profile.exp +++ b/test/environment/rlimit-profile.exp | |||
| @@ -27,7 +27,7 @@ expect { | |||
| 27 | } | 27 | } |
| 28 | expect { | 28 | expect { |
| 29 | timeout {puts "TESTING ERROR 1.4\n";exit} | 29 | timeout {puts "TESTING ERROR 1.4\n";exit} |
| 30 | "Max address space 123456789012 123456789012" | 30 | "Max address space 1234567890 1234567890" |
| 31 | } | 31 | } |
| 32 | expect { | 32 | expect { |
| 33 | timeout {puts "TESTING ERROR 1.5\n";exit} | 33 | timeout {puts "TESTING ERROR 1.5\n";exit} |
diff --git a/test/environment/rlimit.exp b/test/environment/rlimit.exp index 38cdc3eea..c0ba895fe 100755 --- a/test/environment/rlimit.exp +++ b/test/environment/rlimit.exp | |||
| @@ -5,7 +5,7 @@ cd /home | |||
| 5 | spawn $env(SHELL) | 5 | spawn $env(SHELL) |
| 6 | match_max 100000 | 6 | match_max 100000 |
| 7 | 7 | ||
| 8 | send -- "firejail --rlimit-fsize=1024 --rlimit-nproc=1000 --rlimit-nofile=500 --rlimit-sigpending=200 --rlimit-as=123456789012\r" | 8 | send -- "firejail --rlimit-fsize=1024 --rlimit-nproc=1000 --rlimit-nofile=500 --rlimit-sigpending=200 --rlimit-as=1234567890\r" |
| 9 | expect { | 9 | expect { |
| 10 | timeout {puts "TESTING ERROR 0\n";exit} | 10 | timeout {puts "TESTING ERROR 0\n";exit} |
| 11 | "Child process initialized" | 11 | "Child process initialized" |
| @@ -27,7 +27,7 @@ expect { | |||
| 27 | } | 27 | } |
| 28 | expect { | 28 | expect { |
| 29 | timeout {puts "TESTING ERROR 1.4\n";exit} | 29 | timeout {puts "TESTING ERROR 1.4\n";exit} |
| 30 | "Max address space 123456789012 123456789012" | 30 | "Max address space 1234567890 1234567890" |
| 31 | } | 31 | } |
| 32 | expect { | 32 | expect { |
| 33 | timeout {puts "TESTING ERROR 1.5\n";exit} | 33 | timeout {puts "TESTING ERROR 1.5\n";exit} |
diff --git a/test/environment/rlimit.profile b/test/environment/rlimit.profile index a569edc6d..2f1134e6c 100644 --- a/test/environment/rlimit.profile +++ b/test/environment/rlimit.profile | |||
| @@ -2,4 +2,4 @@ rlimit-fsize 1024 | |||
| 2 | rlimit-nproc 1000 | 2 | rlimit-nproc 1000 |
| 3 | rlimit-nofile 500 | 3 | rlimit-nofile 500 |
| 4 | rlimit-sigpending 200 | 4 | rlimit-sigpending 200 |
| 5 | rlimit-as 123456789012 | 5 | rlimit-as 1234567890 |