From c22f9de02db17cb10b08f3d4893987228799ca89 Mon Sep 17 00:00:00 2001
From: netblue30 <netblue30@yahoo.com>
Date: Tue, 9 Aug 2016 07:46:28 -0400
Subject: various fixes

---
 test/features/1.2.exp | 24 ++++++++++++------------
 test/features/3.6.exp | 11 ++++++++---
 test/features/3.8.exp |  8 ++++++--
 3 files changed, 26 insertions(+), 17 deletions(-)

(limited to 'test')

diff --git a/test/features/1.2.exp b/test/features/1.2.exp
index 685acf737..bcb227304 100755
--- a/test/features/1.2.exp
+++ b/test/features/1.2.exp
@@ -115,22 +115,22 @@ if { $chroot == "chroot" } {
 		timeout {puts "TESTING ERROR 5.3\n";exit}
 		"proc /proc/sys proc"
 	}
-	expect {
-		timeout {puts "TESTING ERROR 5.4\n";exit}
-		"proc /proc/sysrq-trigger proc"
-	}
+#	expect {
+#		timeout {puts "TESTING ERROR 5.4\n";exit}
+#		"proc /proc/sysrq-trigger proc"
+#	}
 #	expect {
 #		timeout {puts "TESTING ERROR 5.5\n";exit}
 #		"proc /proc/sys/kernel/hotplug"
 #	}
-	expect {
-		timeout {puts "TESTING ERROR 5.6\n";exit}
-		"proc /proc/irq proc"
-	}
-	expect {
-		timeout {puts "TESTING ERROR 5.7\n";exit}
-		"proc /proc/bus proc"
-	}
+#	expect {
+#		timeout {puts "TESTING ERROR 5.6\n";exit}
+#		"proc /proc/irq proc"
+#	}
+#	expect {
+#		timeout {puts "TESTING ERROR 5.7\n";exit}
+#		"proc /proc/bus proc"
+#	}
 	after 100
 	send -- "exit\r"
 	sleep 1
diff --git a/test/features/3.6.exp b/test/features/3.6.exp
index a00517716..389e63a1d 100755
--- a/test/features/3.6.exp
+++ b/test/features/3.6.exp
@@ -60,14 +60,19 @@ if { $chroot == "chroot" } {
 	expect {
 		timeout {puts "TESTING ERROR 4\n";exit}
 		"chroot option is not available" {puts "grsecurity\n"; exit}
+		"private-etc feature is disabled in chroot"
+	}
+	expect {
+		timeout {puts "TESTING ERROR 5\n";exit}
+		"chroot option is not available" {puts "grsecurity\n"; exit}
 		"Child process initialized"
 	}
 	sleep 1
 	
-	send -- "ls -al /etc | wc -l\r"
+	send -- "ls /etc | grep firejail\r"
 	expect {
-		timeout {puts "TESTING ERROR 5.1\n";exit}
-		"10"
+		timeout {puts "TESTING ERROR 6\n";exit}
+		"firejail"
 	}
 	
 	after 100
diff --git a/test/features/3.8.exp b/test/features/3.8.exp
index 94a1abf67..d941fa9b7 100755
--- a/test/features/3.8.exp
+++ b/test/features/3.8.exp
@@ -61,14 +61,18 @@ if { $chroot == "chroot" } {
 	send -- "firejail --noprofile --chroot=/tmp/chroot --private-bin=bash,cat,cp,ls,wc\r"
 	expect {
 		timeout {puts "TESTING ERROR 4\n";exit}
+		"private-bin feature is disabled in chroot"
+	}
+	expect {
+		timeout {puts "TESTING ERROR 5\n";exit}
 		"Child process initialized"
 	}
 	sleep 1
 	
 	send -- "ls -l /usr/bin | wc -l\r"
 	expect {
-		timeout {puts "TESTING ERROR 5.1\n";exit}
-		"6"
+		timeout {puts "TESTING ERROR 6\n";exit}
+		"9"
 	}
 	
 	after 100
-- 
cgit v1.2.3-54-g00ecf