removed pwd from test/utils

author: netblue30 <netblue30@yahoo.com> 2016-04-28 20:47:36 -0400
committer: netblue30 <netblue30@yahoo.com> 2016-04-28 20:47:36 -0400
commit: 051e84a0068a503a4531712ab7f882240b003b15 (patch)
tree: 298329f7fa3804aaa97ffe44c8cfcbbece187b30 /test
parent: Merge pull request #488 from reinerh/master (diff)
download: firejail-051e84a0068a503a4531712ab7f882240b003b15.tar.gz
firejail-051e84a0068a503a4531712ab7f882240b003b15.tar.zst
firejail-051e84a0068a503a4531712ab7f882240b003b15.zip
5 files changed, 49 insertions, 67 deletions
diff --git a/test/utils/join-profile.exp b/test/utils/join-profile.exp
index 9200980a1..a4262b999 100755
--- a/test/utils/join-profile.exp
+++ b/test/utils/join-profile.exp
@@ -4,36 +4,32 @@ set timeout 10
 spawn $env(SHELL)
 match_max 100000
 send --  "firejail --profile=name.profile\r"
 expect {
        timeout {puts "TESTING ERROR 0\n";exit}
        "Child process initialized"
 }
-sleep 3
+sleep 2
 spawn $env(SHELL)
-send --  "firejail --join=jointesting;pwd\r"
+send --  "firejail --join=jointesting\r"
 expect {
        timeout {puts "TESTING ERROR 1\n";exit}
        "Switching to pid"
 }
-sleep 3
+sleep 1
+send -- "ps aux\r"
-spawn $env(SHELL)
-send --  "firejail --shutdown=jointesting;pwd\r"
 expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
+        timeout {puts "TESTING ERROR 2\n";exit}
-        "home"
+        "/bin/bash"
 }
-sleep 5
-send --  "firejail --list;pwd\r"
 expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
+        timeout {puts "TESTING ERROR 3\n";exit}
-        "jointesting" {puts "TESTING ERROR 5\n";exit}
+        "/bin/bash"
-        "home"
 }
+send -- "exit"
 sleep 1
 puts "\nall done\n"
diff --git a/test/utils/join.exp b/test/utils/join.exp
index e1cd37fcb..ab4917f7d 100755
--- a/test/utils/join.exp
+++ b/test/utils/join.exp
@@ -8,36 +8,31 @@ cd /home
 spawn $env(SHELL)
 match_max 100000
-send --  "firejail --name=svntesting\r"
+send --  "firejail --name=jointesting\r"
 expect {
        timeout {puts "TESTING ERROR 0\n";exit}
        "Child process initialized"
 }
-sleep 3
+sleep 2
 spawn $env(SHELL)
-send --  "firejail --join=svntesting;pwd\r"
+send --  "firejail --join=jointesting\r"
 expect {
        timeout {puts "TESTING ERROR 1\n";exit}
        "Switching to pid"
 }
 sleep 1
+send -- "ps aux\r"
-spawn $env(SHELL)
-send --  "firejail --shutdown=svntesting;pwd\r"
 expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
+        timeout {puts "TESTING ERROR 2\n";exit}
-        "home"
+        "/bin/bash"
 }
-sleep 1
-send --  "firejail --list;pwd\r"
 expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
+        timeout {puts "TESTING ERROR 3\n";exit}
-        "svntesting" {puts "TESTING ERROR 5\n";exit}
+        "/bin/bash"
-        "home"
 }
+send -- "exit"
 sleep 1
 puts "\nall done\n"
diff --git a/test/utils/join2.exp b/test/utils/join2.exp
index 820c43174..82540fe39 100755
--- a/test/utils/join2.exp
+++ b/test/utils/join2.exp
@@ -8,36 +8,31 @@ cd /home
 spawn $env(SHELL)
 match_max 100000
-send --  "firejail --name=\"svn testing\"\r"
+send --  "firejail --name=\"join testing\"\r"
 expect {
        timeout {puts "TESTING ERROR 0\n";exit}
        "Child process initialized"
 }
-sleep 3
+sleep 2
 spawn $env(SHELL)
-send --  "firejail --join=\"svn testing\";pwd\r"
+send --  "firejail --join=\"join testing\"\r"
 expect {
        timeout {puts "TESTING ERROR 1\n";exit}
        "Switching to pid"
 }
 sleep 1
+send -- "ps aux\r"
-spawn $env(SHELL)
-send --  "firejail --shutdown=\"svn testing\";pwd\r"
 expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
+        timeout {puts "TESTING ERROR 2\n";exit}
-        "home"
+        "/bin/bash"
 }
-sleep 1
-send --  "firejail --list;pwd\r"
 expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
+        timeout {puts "TESTING ERROR 3\n";exit}
-        "svn testing" {puts "TESTING ERROR 5\n";exit}
+        "/bin/bash"
-        "home"
 }
+send -- "exit"
 sleep 1
 puts "\nall done\n"
diff --git a/test/utils/join3.exp b/test/utils/join3.exp
index 96d3e5186..e92045dd1 100755
--- a/test/utils/join3.exp
+++ b/test/utils/join3.exp
@@ -8,36 +8,31 @@ cd /home
 spawn $env(SHELL)
 match_max 100000
-send --  "firejail --name=svn\\ testing\r"
+send --  "firejail --name=join\\ testing\r"
 expect {
        timeout {puts "TESTING ERROR 0\n";exit}
        "Child process initialized"
 }
-sleep 3
+sleep 2
 spawn $env(SHELL)
-send --  "firejail --join=svn\\ testing;pwd\r"
+send --  "firejail --join=join\\ testing\r"
 expect {
        timeout {puts "TESTING ERROR 1\n";exit}
        "Switching to pid"
 }
 sleep 1
+send -- "ps aux\r"
-spawn $env(SHELL)
-send --  "firejail --shutdown=svn\\ testing;pwd\r"
 expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
+        timeout {puts "TESTING ERROR 2\n";exit}
-        "home"
+        "/bin/bash"
 }
-sleep 1
-send --  "firejail --list;pwd\r"
 expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
+        timeout {puts "TESTING ERROR 3\n";exit}
-        "svn testing" {puts "TESTING ERROR 5\n";exit}
+        "/bin/bash"
-        "home"
 }
+send -- "exit"
 sleep 1
 puts "\nall done\n"
diff --git a/test/utils/shutdown.exp b/test/utils/shutdown.exp
index ca321b3c9..15a9a62c8 100755
--- a/test/utils/shutdown.exp
+++ b/test/utils/shutdown.exp
@@ -13,22 +13,23 @@ expect {
        timeout {puts "TESTING ERROR 0\n";exit}
        "Child process initialized"
 }
-sleep 3
+sleep 2
 spawn $env(SHELL)
-send --  "firejail --shutdown=shutdowntesting;pwd\r"
+send --  "firejail --shutdown=shutdowntesting; echo done\r"
 expect {
        timeout {puts "TESTING ERROR 4\n";exit}
-        "home"
+        "done"
 }
-sleep 1
+sleep 5
-send --  "firejail --list;pwd\r"
+spawn $env(SHELL)
+send --  "firejail --list;echo done\r"
 expect {
        timeout {puts "TESTING ERROR 5\n";exit}
        "shutdowntesting" {puts "TESTING ERROR 6\n";exit}
-        "home"
+        "done"
 }
 sleep 1
-puts "\nalldone\n"
+puts "\nall done\n"
author	netblue30 <netblue30@yahoo.com>	2016-04-28 20:47:36 -0400
committer	netblue30 <netblue30@yahoo.com>	2016-04-28 20:47:36 -0400
commit	051e84a0068a503a4531712ab7f882240b003b15 (patch)
tree	298329f7fa3804aaa97ffe44c8cfcbbece187b30 /test
parent	Merge pull request #488 from reinerh/master (diff)
download	firejail-051e84a0068a503a4531712ab7f882240b003b15.tar.gz firejail-051e84a0068a503a4531712ab7f882240b003b15.tar.zst firejail-051e84a0068a503a4531712ab7f882240b003b15.zip

diff --git a/test/utils/join-profile.exp b/test/utils/join-profile.exp index 9200980a1..a4262b999 100755 --- a/test/utils/join-profile.exp +++ b/test/utils/join-profile.exp
@@ -4,36 +4,32 @@ set timeout 10
4	spawn $env(SHELL)	4	spawn $env(SHELL)
5	match_max 100000	5	match_max 100000
6		6
		7
7	send -- "firejail --profile=name.profile\r"	8	send -- "firejail --profile=name.profile\r"
8	expect {	9	expect {
9	timeout {puts "TESTING ERROR 0\n";exit}	10	timeout {puts "TESTING ERROR 0\n";exit}
10	"Child process initialized"	11	"Child process initialized"
11	}	12	}
12	sleep 3	13	sleep 2
13		14
14	spawn $env(SHELL)	15	spawn $env(SHELL)
15	send -- "firejail --join=jointesting;pwd\r"	16	send -- "firejail --join=jointesting\r"
16	expect {	17	expect {
17	timeout {puts "TESTING ERROR 1\n";exit}	18	timeout {puts "TESTING ERROR 1\n";exit}
18	"Switching to pid"	19	"Switching to pid"
19	}	20	}
20	sleep 3	21	sleep 1
21		22	send -- "ps aux\r"
22
23	spawn $env(SHELL)
24	send -- "firejail --shutdown=jointesting;pwd\r"
25	expect {	23	expect {
26	timeout {puts "TESTING ERROR 3\n";exit}	24	timeout {puts "TESTING ERROR 2\n";exit}
27	"home"	25	"/bin/bash"
28	}	26	}
29	sleep 5
30
31	send -- "firejail --list;pwd\r"
32	expect {	27	expect {
33	timeout {puts "TESTING ERROR 4\n";exit}	28	timeout {puts "TESTING ERROR 3\n";exit}
34	"jointesting" {puts "TESTING ERROR 5\n";exit}	29	"/bin/bash"
35	"home"
36	}	30	}
		31
		32	send -- "exit"
37	sleep 1	33	sleep 1
38		34
39	puts "\nall done\n"	35	puts "\nall done\n"


diff --git a/test/utils/join.exp b/test/utils/join.exp index e1cd37fcb..ab4917f7d 100755 --- a/test/utils/join.exp +++ b/test/utils/join.exp
@@ -8,36 +8,31 @@ cd /home
8	spawn $env(SHELL)	8	spawn $env(SHELL)
9	match_max 100000	9	match_max 100000
10		10
11	send -- "firejail --name=svntesting\r"	11	send -- "firejail --name=jointesting\r"
12	expect {	12	expect {
13	timeout {puts "TESTING ERROR 0\n";exit}	13	timeout {puts "TESTING ERROR 0\n";exit}
14	"Child process initialized"	14	"Child process initialized"
15	}	15	}
16	sleep 3	16	sleep 2
17		17
18	spawn $env(SHELL)	18	spawn $env(SHELL)
19	send -- "firejail --join=svntesting;pwd\r"	19	send -- "firejail --join=jointesting\r"
20	expect {	20	expect {
21	timeout {puts "TESTING ERROR 1\n";exit}	21	timeout {puts "TESTING ERROR 1\n";exit}
22	"Switching to pid"	22	"Switching to pid"
23	}	23	}
24	sleep 1	24	sleep 1
25		25	send -- "ps aux\r"
26
27	spawn $env(SHELL)
28	send -- "firejail --shutdown=svntesting;pwd\r"
29	expect {	26	expect {
30	timeout {puts "TESTING ERROR 3\n";exit}	27	timeout {puts "TESTING ERROR 2\n";exit}
31	"home"	28	"/bin/bash"
32	}	29	}
33	sleep 1
34
35	send -- "firejail --list;pwd\r"
36	expect {	30	expect {
37	timeout {puts "TESTING ERROR 4\n";exit}	31	timeout {puts "TESTING ERROR 3\n";exit}
38	"svntesting" {puts "TESTING ERROR 5\n";exit}	32	"/bin/bash"
39	"home"
40	}	33	}
		34
		35	send -- "exit"
41	sleep 1	36	sleep 1
42		37
43	puts "\nall done\n"	38	puts "\nall done\n"


diff --git a/test/utils/join2.exp b/test/utils/join2.exp index 820c43174..82540fe39 100755 --- a/test/utils/join2.exp +++ b/test/utils/join2.exp
@@ -8,36 +8,31 @@ cd /home
8	spawn $env(SHELL)	8	spawn $env(SHELL)
9	match_max 100000	9	match_max 100000
10		10
11	send -- "firejail --name=\"svn testing\"\r"	11	send -- "firejail --name=\"join testing\"\r"
12	expect {	12	expect {
13	timeout {puts "TESTING ERROR 0\n";exit}	13	timeout {puts "TESTING ERROR 0\n";exit}
14	"Child process initialized"	14	"Child process initialized"
15	}	15	}
16	sleep 3	16	sleep 2
17		17
18	spawn $env(SHELL)	18	spawn $env(SHELL)
19	send -- "firejail --join=\"svn testing\";pwd\r"	19	send -- "firejail --join=\"join testing\"\r"
20	expect {	20	expect {
21	timeout {puts "TESTING ERROR 1\n";exit}	21	timeout {puts "TESTING ERROR 1\n";exit}
22	"Switching to pid"	22	"Switching to pid"
23	}	23	}
24	sleep 1	24	sleep 1
25		25	send -- "ps aux\r"
26
27	spawn $env(SHELL)
28	send -- "firejail --shutdown=\"svn testing\";pwd\r"
29	expect {	26	expect {
30	timeout {puts "TESTING ERROR 3\n";exit}	27	timeout {puts "TESTING ERROR 2\n";exit}
31	"home"	28	"/bin/bash"
32	}	29	}
33	sleep 1
34
35	send -- "firejail --list;pwd\r"
36	expect {	30	expect {
37	timeout {puts "TESTING ERROR 4\n";exit}	31	timeout {puts "TESTING ERROR 3\n";exit}
38	"svn testing" {puts "TESTING ERROR 5\n";exit}	32	"/bin/bash"
39	"home"
40	}	33	}
		34
		35	send -- "exit"
41	sleep 1	36	sleep 1
42		37
43	puts "\nall done\n"	38	puts "\nall done\n"


diff --git a/test/utils/join3.exp b/test/utils/join3.exp index 96d3e5186..e92045dd1 100755 --- a/test/utils/join3.exp +++ b/test/utils/join3.exp
@@ -8,36 +8,31 @@ cd /home
8	spawn $env(SHELL)	8	spawn $env(SHELL)
9	match_max 100000	9	match_max 100000
10		10
11	send -- "firejail --name=svn\\ testing\r"	11	send -- "firejail --name=join\\ testing\r"
12	expect {	12	expect {
13	timeout {puts "TESTING ERROR 0\n";exit}	13	timeout {puts "TESTING ERROR 0\n";exit}
14	"Child process initialized"	14	"Child process initialized"
15	}	15	}
16	sleep 3	16	sleep 2
17		17
18	spawn $env(SHELL)	18	spawn $env(SHELL)
19	send -- "firejail --join=svn\\ testing;pwd\r"	19	send -- "firejail --join=join\\ testing\r"
20	expect {	20	expect {
21	timeout {puts "TESTING ERROR 1\n";exit}	21	timeout {puts "TESTING ERROR 1\n";exit}
22	"Switching to pid"	22	"Switching to pid"
23	}	23	}
24	sleep 1	24	sleep 1
25		25	send -- "ps aux\r"
26
27	spawn $env(SHELL)
28	send -- "firejail --shutdown=svn\\ testing;pwd\r"
29	expect {	26	expect {
30	timeout {puts "TESTING ERROR 3\n";exit}	27	timeout {puts "TESTING ERROR 2\n";exit}
31	"home"	28	"/bin/bash"
32	}	29	}
33	sleep 1
34
35	send -- "firejail --list;pwd\r"
36	expect {	30	expect {
37	timeout {puts "TESTING ERROR 4\n";exit}	31	timeout {puts "TESTING ERROR 3\n";exit}
38	"svn testing" {puts "TESTING ERROR 5\n";exit}	32	"/bin/bash"
39	"home"
40	}	33	}
		34
		35	send -- "exit"
41	sleep 1	36	sleep 1
42		37
43	puts "\nall done\n"	38	puts "\nall done\n"


diff --git a/test/utils/shutdown.exp b/test/utils/shutdown.exp index ca321b3c9..15a9a62c8 100755 --- a/test/utils/shutdown.exp +++ b/test/utils/shutdown.exp
@@ -13,22 +13,23 @@ expect {
13	timeout {puts "TESTING ERROR 0\n";exit}	13	timeout {puts "TESTING ERROR 0\n";exit}
14	"Child process initialized"	14	"Child process initialized"
15	}	15	}
16	sleep 3	16	sleep 2
17		17
18	spawn $env(SHELL)	18	spawn $env(SHELL)
19	send -- "firejail --shutdown=shutdowntesting;pwd\r"	19	send -- "firejail --shutdown=shutdowntesting; echo done\r"
20	expect {	20	expect {
21	timeout {puts "TESTING ERROR 4\n";exit}	21	timeout {puts "TESTING ERROR 4\n";exit}
22	"home"	22	"done"
23	}	23	}
24	sleep 1	24	sleep 5
25		25
26	send -- "firejail --list;pwd\r"	26	spawn $env(SHELL)
		27	send -- "firejail --list;echo done\r"
27	expect {	28	expect {
28	timeout {puts "TESTING ERROR 5\n";exit}	29	timeout {puts "TESTING ERROR 5\n";exit}
29	"shutdowntesting" {puts "TESTING ERROR 6\n";exit}	30	"shutdowntesting" {puts "TESTING ERROR 6\n";exit}
30	"home"	31	"done"
31	}	32	}
32	sleep 1	33	sleep 1
33		34
34	puts "\nalldone\n"	35	puts "\nall done\n"