Make some tests more robust

7 files changed, 17 insertions, 6 deletions

diff --git a/test/environment/csh.exp b/test/environment/csh.exp
index 10ad3607e..7fd69ed43 100755
--- a/test/environment/csh.exp
+++ b/test/environment/csh.exp
@@ -4,6 +4,7 @@
 # License GPL v2
 
 set timeout 10
+cd /home
 spawn $env(SHELL)
 match_max 100000
 
diff --git a/test/environment/dash.exp b/test/environment/dash.exp
index f5a60719e..d727d302e 100755
--- a/test/environment/dash.exp
+++ b/test/environment/dash.exp
@@ -1,6 +1,7 @@
 #!/usr/bin/expect -f
 
 set timeout 10
+cd /home
 spawn $env(SHELL)
 match_max 100000
 
diff --git a/test/environment/environment.sh b/test/environment/environment.sh
index ede5735c6..9164b43a2 100755
--- a/test/environment/environment.sh
+++ b/test/environment/environment.sh
@@ -51,8 +51,14 @@ echo "TESTING: firejail in firejail - single sandbox (test/environment/firejail-
 echo "TESTING: firejail in firejail - force new sandbox (test/environment/firejail-in-firejail2.exp)"
 ./firejail-in-firejail2.exp
 
-echo "TESTING: sound (test/environment/sound.exp)"
-./sound.exp
+which aplay
+if [ "$?" -eq 0 ];
+then
+        echo "TESTING: sound (test/environment/sound.exp)"
+        ./sound.exp
+else
+        echo "TESTING: aplay not found"
+fi
 
 echo "TESTING: nice (test/environment/nice.exp)"
 ./nice.exp
diff --git a/test/environment/nice.exp b/test/environment/nice.exp
index 7e5731c63..3a5db71c8 100755
--- a/test/environment/nice.exp
+++ b/test/environment/nice.exp
@@ -17,7 +17,7 @@ sleep 1
 send -- "top -b -n 1\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
-        "netblue"
+        $env(USER)
 }
 expect {
         timeout {puts "TESTING ERROR 2\n";exit}
@@ -29,7 +29,7 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
-        "netblu"
+        $env(USER)
 }
 expect {
         timeout {puts "TESTING ERROR 5\n";exit}
@@ -54,7 +54,7 @@ sleep 1
 send -- "top -b -n 1\r"
 expect {
         timeout {puts "TESTING ERROR 11\n";exit}
-        "netblue"
+        $env(USER)
 }
 expect {
         timeout {puts "TESTING ERROR 12\n";exit}
@@ -66,7 +66,7 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 14\n";exit}
-        "netblu"
+        $env(USER)
 }
 expect {
         timeout {puts "TESTING ERROR 15\n";exit}
diff --git a/test/environment/rlimit-profile.exp b/test/environment/rlimit-profile.exp
index 7d2637444..aed634201 100755
--- a/test/environment/rlimit-profile.exp
+++ b/test/environment/rlimit-profile.exp
@@ -1,6 +1,7 @@
 #!/usr/bin/expect -f
 
 set timeout 10
+cd /home
 spawn $env(SHELL)
 match_max 100000
 
diff --git a/test/environment/rlimit.exp b/test/environment/rlimit.exp
index 17d2bd9d1..680520b33 100755
--- a/test/environment/rlimit.exp
+++ b/test/environment/rlimit.exp
@@ -1,6 +1,7 @@
 #!/usr/bin/expect -f
 
 set timeout 10
+cd /home
 spawn $env(SHELL)
 match_max 100000
 
diff --git a/test/environment/zsh.exp b/test/environment/zsh.exp
index 2604b2be5..96fa84dfe 100755
--- a/test/environment/zsh.exp
+++ b/test/environment/zsh.exp
@@ -4,6 +4,7 @@
 # License GPL v2
 
 set timeout 10
+cd /home
 spawn $env(SHELL)
 match_max 100000