test fixes

3 files changed, 7 insertions, 47 deletions

diff --git a/test/fs/fs.sh b/test/fs/fs.sh
index 425af45a6..0fcffcb8e 100755
--- a/test/fs/fs.sh
+++ b/test/fs/fs.sh
@@ -31,7 +31,6 @@ echo "TESTING: whitelist empty (test/fs/whitelist-empty.exp)"
 ./whitelist-empty.exp
 
 echo "TESTING: private whitelist (test/fs/private-whitelist.exp)"
-echo "TESTING:     (failing on OpenSUSE)"
 ./private-whitelist.exp
 
 echo "TESTING: invalid filename (test/fs/invalid_filename.exp)"
diff --git a/test/fs/private-whitelist.exp b/test/fs/private-whitelist.exp
index a3d60369a..4dadeacb1 100755
--- a/test/fs/private-whitelist.exp
+++ b/test/fs/private-whitelist.exp
@@ -12,26 +12,28 @@ expect {
         timeout {puts "TESTING ERROR 1\n";exit}
         "Child process initialized"
 }
-sleep 1
+after 100
 
 send -- "ls -al /tmp\r"
 expect {
         timeout {puts "TESTING ERROR 2\n";exit}
         ".X11-unix"
 }
-sleep 1
+after 100
 
 send -- "ls -a /tmp | wc -l\r"
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
         "3"
 }
-sleep 1
+after 100
 
 send -- "ls -a ~ | wc -l\r"
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
-        "5"
+        "3" {puts "3\n"}
+        "4" {puts "4\n"}
+        "5" {puts "5\n"}
 }
 
 sleep 1
diff --git a/test/fs/private.exp b/test/fs/private.exp
index 01f04d3cb..7eee0c82b 100755
--- a/test/fs/private.exp
+++ b/test/fs/private.exp
@@ -38,49 +38,8 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
-        [lindex $argv 0]
+        done
 }
-send -- "ls -al; echo done\r"
-expect {
-        timeout {
-                # OpenSUSE doesn't use .Xauthority from user done directory
-                send -- "env | grep XAUTHORITY\r"
-
-                expect {
-                        timeout {puts "TESTING ERROR 4\n";exit}
-                        "/run/lightdm/netblue/xauthority"
-                }
-        }
-        ".Xauthority"
-}
-expect {
-        timeout {puts "TESTING ERROR 5\n";exit}
-        [lindex $argv 0]
-}
-
-
-# testing private only
-send -- "bash\r"
-sleep 1
-# owner /done/netblue
-send -- "ls -l /done;echo done\r"
-expect {
-        timeout {puts "TESTING ERROR 6\n";exit}
-        [lindex $argv 0]
-}
-expect {
-        timeout {puts "TESTING ERROR 7\n";exit}
-        [lindex $argv 0]
-}
-expect {
-        timeout {puts "TESTING ERROR 8\n";exit}
-        [lindex $argv 0]
-}
-expect {
-        timeout {puts "TESTING ERROR 9\n";exit}
-        "done"
-}
-sleep 1
 
 # owner /tmp
 send -- "stat -c %U%a /tmp;echo done\r"