From 14ad07435d339b290e284995c1d0349f4434a371 Mon Sep 17 00:00:00 2001 From: netblue30 Date: Sat, 16 Jul 2016 12:58:09 -0400 Subject: testing --- test/features/1.2.exp | 6 +++--- test/features/1.8.exp | 18 ------------------ test/features/3.5.exp | 10 +++++----- test/private_dir.exp | 2 +- test/private_dir_profile.exp | 2 +- test/test.sh | 3 --- 6 files changed, 10 insertions(+), 31 deletions(-) (limited to 'test') diff --git a/test/features/1.2.exp b/test/features/1.2.exp index 6f7cae888..685acf737 100755 --- a/test/features/1.2.exp +++ b/test/features/1.2.exp @@ -34,7 +34,7 @@ expect { } expect { timeout {puts "TESTING ERROR 1.4\n";exit} - "proc /proc/sysrq-trigger proc" + "/proc/sysrq-trigger" } #expect { # timeout {puts "TESTING ERROR 1.5\n";exit} @@ -42,11 +42,11 @@ expect { #} expect { timeout {puts "TESTING ERROR 1.6\n";exit} - "proc /proc/irq proc" + "/proc/irq" } expect { timeout {puts "TESTING ERROR 1.7\n";exit} - "proc /proc/bus proc" + "/proc/bus" } after 100 send -- "exit\r" diff --git a/test/features/1.8.exp b/test/features/1.8.exp index 493a87328..4c6d3f3dc 100755 --- a/test/features/1.8.exp +++ b/test/features/1.8.exp @@ -20,12 +20,6 @@ expect { } sleep 1 -send -- "ls /etc/firejail\r" -expect { - timeout {puts "TESTING ERROR 1\n";exit} - "Permission denied" -} -after 100 send -- "ls ~/.config/firejail\r" expect { timeout {puts "TESTING ERROR 1.1\n";exit} @@ -77,12 +71,6 @@ if { $overlay == "overlay" } { "Child process initialized" {puts "normal system\n"} } sleep 1 - send -- "ls /etc/firejail\r" - expect { - timeout {puts "TESTING ERROR 3\n";exit} - "Permission denied" - } - after 100 send -- "ls ~/.config/firejail\r" expect { timeout {puts "TESTING ERROR 3.1\n";exit} @@ -134,12 +122,6 @@ if { $chroot == "chroot" } { "Child process initialized" } sleep 1 - send -- "ls /etc/firejail\r" - expect { - timeout {puts "TESTING ERROR 5\n";exit} - "Permission denied" - } - after 100 send -- "ls ~/.config/firejail\r" expect { timeout {puts "TESTING ERROR 5.1\n";exit} diff --git a/test/features/3.5.exp b/test/features/3.5.exp index aed5fe836..f4b544b3d 100755 --- a/test/features/3.5.exp +++ b/test/features/3.5.exp @@ -22,8 +22,8 @@ sleep 1 send -- "ls -l /dev | wc -l\r" expect { timeout {puts "TESTING ERROR 1.1\n";exit} - "12" { puts "Debian\n"} - "11" { puts "Centos\n"} + "13" { puts "Debian\n"} + "12" { puts "Centos\n"} } after 100 @@ -45,8 +45,8 @@ if { $overlay == "overlay" } { send -- "ls -l /dev | wc -l\r" expect { timeout {puts "TESTING ERROR 3.1\n";exit} - "12" { puts "Debian\n"} - "11" { puts "Centos\n"} + "13" { puts "Debian\n"} + "12" { puts "Centos\n"} } after 100 @@ -68,7 +68,7 @@ if { $chroot == "chroot" } { send -- "ls -l /dev | wc -l\r" expect { timeout {puts "TESTING ERROR 5.1\n";exit} - "11" + "12" } after 100 diff --git a/test/private_dir.exp b/test/private_dir.exp index 9dfb2ea9f..a4beeba27 100755 --- a/test/private_dir.exp +++ b/test/private_dir.exp @@ -42,7 +42,7 @@ expect { send -- "ls -al | wc -l;pwd\r" expect { timeout {puts "TESTING ERROR 1\n";exit} - "7" {puts "normal system\n";} + "6" {puts "normal system\n";} "5" {puts "OpenSUSE\n";} } expect { diff --git a/test/private_dir_profile.exp b/test/private_dir_profile.exp index 5b38ad0bb..8d1c74444 100755 --- a/test/private_dir_profile.exp +++ b/test/private_dir_profile.exp @@ -42,7 +42,7 @@ expect { send -- "ls -al | wc -l;pwd\r" expect { timeout {puts "TESTING ERROR 1\n";exit} - "7" {puts "normal system\n";} + "6" {puts "normal system\n";} "5" {puts "OpenSUSE\n";} } expect { diff --git a/test/test.sh b/test/test.sh index 71e2c6720..4b7d5bb6d 100755 --- a/test/test.sh +++ b/test/test.sh @@ -62,9 +62,6 @@ echo "TESTING: overlayfs (fs_overlay.exp)" echo "TESTING: login SSH (login_ssh.exp)" ./login_ssh.exp -echo "TESTING: DNS (dns.exp)" -./dns.exp - echo "TESTING: firemon --arp (firemon-arp.exp)" ./firemon-arp.exp -- cgit v1.2.3-54-g00ecf