From bb14c205b562f6162aadff969540a956aacc0bd1 Mon Sep 17 00:00:00 2001
From: netblue30 <netblue30@protonmail.com>
Date: Sun, 19 Jun 2022 20:03:14 -0400
Subject: shell none set as default (6)

---
 test/environment/csh.exp        | 34 -------------------------------
 test/environment/dash.exp       | 44 -----------------------------------------
 test/environment/environment.sh | 27 -------------------------
 test/environment/zsh.exp        | 34 -------------------------------
 test/utils/join.exp             |  8 --------
 5 files changed, 147 deletions(-)
 delete mode 100755 test/environment/csh.exp
 delete mode 100755 test/environment/dash.exp
 delete mode 100755 test/environment/zsh.exp

(limited to 'test')

diff --git a/test/environment/csh.exp b/test/environment/csh.exp
deleted file mode 100755
index 31bfbfa40..000000000
--- a/test/environment/csh.exp
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/expect -f
-# This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
-# License GPL v2
-
-set timeout 10
-cd /home
-spawn $env(SHELL)
-match_max 100000
-
-send -- "firejail --private --shell=/bin/csh\r"
-expect {
-	timeout {puts "TESTING ERROR 0\n";exit}
-	-re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
-}
-sleep 1
-
-send -- "env | grep SHELL;pwd\r"
-expect {
-	timeout {puts "TESTING ERROR 1\n";exit}
-	"SHELL"
-}
-expect {
-	timeout {puts "TESTING ERROR 2\n";exit}
-	"/bin/csh"
-}
-expect {
-	timeout {puts "TESTING ERROR 3\n";exit}
-	"home"
-}
-send -- "exit\r"
-after 100
-
-puts "\nall done\n"
diff --git a/test/environment/dash.exp b/test/environment/dash.exp
deleted file mode 100755
index 4dd5cac9f..000000000
--- a/test/environment/dash.exp
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/expect -f
-# This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
-# License GPL v2
-
-set timeout 10
-cd /home
-spawn $env(SHELL)
-match_max 100000
-
-send -- "firejail --private --tracelog --shell=/bin/dash\r"
-expect {
-	timeout {puts "TESTING ERROR 0\n";exit}
-	-re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
-}
-sleep 1
-
-#send -- "ls -al;pwd\r"
-#expect {
-#	timeout {puts "TESTING ERROR 1\n";exit}
-#	".zshrc"
-#}
-#expect {
-#	timeout {puts "TESTING ERROR 1.1\n";exit}
-#	"home"
-#}
-
-send -- "env | grep SHELL;pwd\r"
-expect {
-	timeout {puts "TESTING ERROR 2\n";exit}
-	"SHELL"
-}
-expect {
-	timeout {puts "TESTING ERROR 2.1\n";exit}
-	"/bin/dash"
-}
-expect {
-	timeout {puts "TESTING ERROR 2.2\n";exit}
-	"home"
-}
-send -- "exit\r"
-after 100
-
-puts "\n"
diff --git a/test/environment/environment.sh b/test/environment/environment.sh
index 9e58fdf95..da9c170b9 100755
--- a/test/environment/environment.sh
+++ b/test/environment/environment.sh
@@ -36,33 +36,6 @@ echo "TESTING: extract command (extract_command.exp)"
 echo "TESTING: environment variables (test/environment/env.exp)"
 ./env.exp
 
-which dash 2>/dev/null
-if [ "$?" -eq 0 ];
-then
-        echo "TESTING: dash (test/environment/dash.exp)"
-        ./dash.exp
-else
-        echo "TESTING SKIP: dash not found"
-fi
-
-which csh 2>/dev/null
-if [ "$?" -eq 0 ];
-then
-        echo "TESTING: csh (test/environment/csh.exp)"
-        ./csh.exp
-else
-        echo "TESTING SKIP: csh not found"
-fi
-
-which zsh 2>/dev/null
-if [ "$?" -eq 0 ];
-then
-        echo "TESTING: zsh (test/environment/zsh.exp)"
-        ./zsh.exp
-else
-        echo "TESTING SKIP: zsh not found"
-fi
-
 echo "TESTING: firejail in firejail - single sandbox (test/environment/firejail-in-firejail.exp)"
 ./firejail-in-firejail.exp
 
diff --git a/test/environment/zsh.exp b/test/environment/zsh.exp
deleted file mode 100755
index 9f871ea54..000000000
--- a/test/environment/zsh.exp
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/expect -f
-# This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
-# License GPL v2
-
-set timeout 10
-cd /home
-spawn $env(SHELL)
-match_max 100000
-
-send -- "firejail --private --shell=/bin/zsh\r"
-expect {
-	timeout {puts "TESTING ERROR 0\n";exit}
-	-re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
-}
-sleep 1
-
-send -- "env | grep SHELL;pwd\r"
-expect {
-	timeout {puts "TESTING ERROR 1\n";exit}
-	"SHELL"
-}
-expect {
-	timeout {puts "TESTING ERROR 2\n";exit}
-	"/bin/zsh"
-}
-expect {
-	timeout {puts "TESTING ERROR 3\n";exit}
-	"home"
-}
-send -- "exit\r"
-after 100
-
-puts "\nall done\n"
diff --git a/test/utils/join.exp b/test/utils/join.exp
index 82decce51..d7dc0a1f9 100755
--- a/test/utils/join.exp
+++ b/test/utils/join.exp
@@ -16,14 +16,6 @@ expect {
 sleep 2
 
 spawn $env(SHELL)
-send --  "firejail --shell=none --join=jointesting\r"
-expect {
-	timeout {puts "TESTING ERROR 1\n";exit}
-	"shell=none set, but no command specified"
-}
-after 100
-
-
 send --  "firejail --join=jointesting\r"
 expect {
 	timeout {puts "TESTING ERROR 2\n";exit}
-- 
cgit v1.2.3-54-g00ecf