From a5a02b708e871086854fc5da3d8d69beb4acf490 Mon Sep 17 00:00:00 2001
From: netblue30 <netblue30@yahoo.com>
Date: Tue, 9 Apr 2019 16:56:58 -0400
Subject: fix previous commit, more seccomp testing

---
 test/filters/seccomp-debug.exp | 46 +++++++++++++++++++++---------------------
 test/filters/seccomp-join.exp  | 44 ++++++++++++++++++++--------------------
 2 files changed, 45 insertions(+), 45 deletions(-)

(limited to 'test')

diff --git a/test/filters/seccomp-debug.exp b/test/filters/seccomp-debug.exp
index 39f836ed0..dc4bf34f2 100755
--- a/test/filters/seccomp-debug.exp
+++ b/test/filters/seccomp-debug.exp
@@ -13,7 +13,7 @@ after 100
 send --  "firejail --debug sleep 1; echo done\r"
 expect {
 	timeout {puts "TESTING ERROR 0\n";exit}
-	"seccomp entries in /run/firejail/mnt/seccomp"
+	"seccomp entries in /run/firejail/mnt/seccomp/seccomp"
 }
 expect {
 	timeout {puts "TESTING ERROR 2\n";exit}
@@ -38,15 +38,15 @@ expect {
 }
 expect {
 	timeout {puts "TESTING ERROR 6\n";exit}
-	"Installing /run/firejail/mnt/seccomp seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp seccomp filter"
 }
 expect {
 	timeout {puts "TESTING ERROR 7\n";exit}
-	"Installing /run/firejail/mnt/seccomp.32 seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter"
 }
 expect {
 	timeout {puts "TESTING ERROR 8\n";exit}
-	"Installing /run/firejail/mnt/seccomp.protocol seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter"
 }
 expect {
 	timeout {puts "TESTING ERROR 9\n";exit}
@@ -58,15 +58,15 @@ after 100
 send --  "firejail --debug --ignore=seccomp sleep 1; echo done\r"
 expect {
 	timeout {puts "TESTING ERROR 10\n";exit}
-	"Installing /run/firejail/mnt/seccomp seccomp filter" {puts "TESTING ERROR 11\n";exit}
-	"Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 12\n";exit}
+	"Installing /run/firejail/mnt/seccomp/seccomp seccomp filter" {puts "TESTING ERROR 11\n";exit}
+	"Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 12\n";exit}
 	"Child process initialized"
 }
 expect {
 	timeout {puts "TESTING ERROR 13\n";exit}
-	"Installing /run/firejail/mnt/seccomp seccomp filter" {puts "TESTING ERROR 14\n";exit}
-	"Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 15\n";exit}
-	"Installing /run/firejail/mnt/seccomp.protocol seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp seccomp filter" {puts "TESTING ERROR 14\n";exit}
+	"Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 15\n";exit}
+	"Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter"
 }
 expect {
 	timeout {puts "TESTING ERROR 16\n";exit}
@@ -78,18 +78,18 @@ after 100
 send --  "firejail --debug --ignore=protocol sleep 1; echo done\r"
 expect {
 	timeout {puts "TESTING ERROR 17\n";exit}
-	"Installing /run/firejail/mnt/seccomp.protocol seccomp filter" {puts "TESTING ERROR 18\n";exit}
+	"Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter" {puts "TESTING ERROR 18\n";exit}
 	"Child process initialized"
 }
 expect {
 	timeout {puts "TESTING ERROR 19\n";exit}
-	"Installing /run/firejail/mnt/seccomp.protocol seccomp filter" {puts "TESTING ERROR 20\n";exit}
-	"Installing /run/firejail/mnt/seccomp seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter" {puts "TESTING ERROR 20\n";exit}
+	"Installing /run/firejail/mnt/seccomp/seccomp seccomp filter"
 }
 expect {
 	timeout {puts "TESTING ERROR 21\n";exit}
-	"Installing /run/firejail/mnt/seccomp.protocol seccomp filter" {puts "TESTING ERROR 22\n";exit}
-	"Installing /run/firejail/mnt/seccomp.32 seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter" {puts "TESTING ERROR 22\n";exit}
+	"Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter"
 }
 expect {
 	timeout {puts "TESTING ERROR 23\n";exit}
@@ -105,7 +105,7 @@ expect {
 }
 expect {
 	timeout {puts "TESTING ERROR 25\n";exit}
-	"Installing /run/firejail/mnt/seccomp.mdwx seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp.mdwx seccomp filter"
 }
 expect {
 	timeout {puts "TESTING ERROR 26\n";exit}
@@ -117,18 +117,18 @@ expect {
 send --  "firejail --debug --seccomp.block-secondary sleep 1; echo done\r"
 expect {
 	timeout {puts "TESTING ERROR 27\n";exit}
-	"Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 28\n";exit}
+	"Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 28\n";exit}
 	"Child process initialized"
 }
 expect {
 	timeout {puts "TESTING ERROR 29\n";exit}
-	"Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 30\n";exit}
-	"Installing /run/firejail/mnt/seccomp seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 30\n";exit}
+	"Installing /run/firejail/mnt/seccomp/seccomp seccomp filter"
 }
 expect {
 	timeout {puts "TESTING ERROR 31\n";exit}
-	"Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 32\n";exit}
-	"Installing /run/firejail/mnt/seccomp.protocol seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 32\n";exit}
+	"Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter"
 }
 expect {
 	timeout {puts "TESTING ERROR 33\n";exit}
@@ -140,13 +140,13 @@ after 100
 send --  "firejail --debug --profile=block-secondary.profile sleep 1; echo done\r"
 expect {
 	timeout {puts "TESTING ERROR 33\n";exit}
-	"Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 34\n";exit}
+	"Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 34\n";exit}
 	"Child process initialized"
 }
 expect {
 	timeout {puts "TESTING ERROR 35\n";exit}
-	"Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 35\n";exit}
-	"Installing /run/firejail/mnt/seccomp seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 35\n";exit}
+	"Installing /run/firejail/mnt/seccomp/seccomp seccomp filter"
 }
 expect {
 	timeout {puts "TESTING ERROR 37\n";exit}
diff --git a/test/filters/seccomp-join.exp b/test/filters/seccomp-join.exp
index f9201f926..f1d57238b 100755
--- a/test/filters/seccomp-join.exp
+++ b/test/filters/seccomp-join.exp
@@ -20,15 +20,15 @@ set spawn_id $id1
 send --  "firejail --name=jointesting --debug\r"
 expect {
 	timeout {puts "TESTING ERROR 0\n";exit}
-	"Installing /run/firejail/mnt/seccomp seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp seccomp filter"
 }
 expect {
 	timeout {puts "TESTING ERROR 1\n";exit}
-	"Installing /run/firejail/mnt/seccomp.32 seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter"
 }
 expect {
 	timeout {puts "TESTING ERROR 2\n";exit}
-	"Installing /run/firejail/mnt/seccomp.protocol seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter"
 }
 sleep 1
 
@@ -37,15 +37,15 @@ set spawn_id $id2
 send --  "firejail --debug --join=jointesting\r"
 expect {
 	timeout {puts "TESTING ERROR 3\n";exit}
-	"Installing /run/firejail/mnt/seccomp seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp seccomp filter"
 }
 expect {
 	timeout {puts "TESTING ERROR 4\n";exit}
-	"Installing /run/firejail/mnt/seccomp.32 seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter"
 }
 expect {
 	timeout {puts "TESTING ERROR 5\n";exit}
-	"Installing /run/firejail/mnt/seccomp.protocol seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter"
 }
 sleep 1
 
@@ -64,16 +64,16 @@ set spawn_id $id1
 send --  "firejail --name=jointesting --seccomp.block-secondary --debug\r"
 expect {
 	timeout {puts "TESTING ERROR 10\n";exit}
-	"Installing /run/firejail/mnt/seccomp seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp seccomp filter"
 }
 expect {
 	timeout {puts "TESTING ERROR 11\n";exit}
-	"Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 12\n";exit}
-	"Installing /run/firejail/mnt/seccomp.block_secondary seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 12\n";exit}
+	"Installing /run/firejail/mnt/seccomp/seccomp.block_secondary seccomp filter"
 }
 expect {
 	timeout {puts "TESTING ERROR 13\n";exit}
-	"Installing /run/firejail/mnt/seccomp.protocol seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter"
 }
 sleep 1
 
@@ -81,15 +81,15 @@ set spawn_id $id2
 send --  "firejail --debug --join=jointesting\r"
 expect {
 	timeout {puts "TESTING ERROR 14\n";exit}
-	"Installing /run/firejail/mnt/seccomp seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp seccomp filter"
 }
 expect {
 	timeout {puts "TESTING ERROR 15\n";exit}
-	"Installing /run/firejail/mnt/seccomp.block_secondary seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp.block_secondary seccomp filter"
 }
 expect {
 	timeout {puts "TESTING ERROR 16\n";exit}
-	"Installing /run/firejail/mnt/seccomp.protocol seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter"
 }
 sleep 1
 
@@ -106,7 +106,7 @@ set spawn_id $id1
 send --  "firejail --name=jointesting --noprofile --protocol=inet --debug\r"
 expect {
 	timeout {puts "TESTING ERROR 22\n";exit}
-	"Installing /run/firejail/mnt/seccomp.protocol seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter"
 }
 sleep 1
 
@@ -115,9 +115,9 @@ set spawn_id $id2
 send --  "firejail --debug --join=jointesting\r"
 expect {
 	timeout {puts "TESTING ERROR 23\n";exit}
-	"Installing /run/firejail/mnt/seccomp seccomp filter" {puts "TESTING ERROR 24\n";exit}
-	"Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 25\n";exit}
-	"Installing /run/firejail/mnt/seccomp.protocol seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp seccomp filter" {puts "TESTING ERROR 24\n";exit}
+	"Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 25\n";exit}
+	"Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter"
 }
 sleep 1
 
@@ -134,7 +134,7 @@ set spawn_id $id1
 send --  "firejail --name=jointesting --noprofile --memory-deny-write-execute --debug\r"
 expect {
 	timeout {puts "TESTING ERROR 32\n";exit}
-	"Installing /run/firejail/mnt/seccomp.mdwx seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp.mdwx seccomp filter"
 }
 sleep 1
 
@@ -143,10 +143,10 @@ set spawn_id $id2
 send --  "firejail --debug --join=jointesting\r"
 expect {
 	timeout {puts "TESTING ERROR 33\n";exit}
-	"Installing /run/firejail/mnt/seccomp seccomp filter" {puts "TESTING ERROR 34\n";exit}
-	"Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 35\n";exit}
-	"Installing /run/firejail/mnt/seccomp.protocol seccomp filter" {puts "TESTING ERROR 36\n";exit}
-	"Installing /run/firejail/mnt/seccomp.mdwx seccomp filter"
+	"Installing /run/firejail/mnt/seccomp/seccomp seccomp filter" {puts "TESTING ERROR 34\n";exit}
+	"Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 35\n";exit}
+	"Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter" {puts "TESTING ERROR 36\n";exit}
+	"Installing /run/firejail/mnt/seccomp/seccomp.mdwx seccomp filter"
 }
 sleep 1
 
-- 
cgit v1.2.3-54-g00ecf