From 4caf05b08d4eeecd621dcb182682be79ccd38f03 Mon Sep 17 00:00:00 2001 From: netblue30 Date: Sun, 19 Jun 2022 17:42:15 -0400 Subject: shell none set as default (4) --- test/environment/environment.sh | 3 --- test/environment/shell-none.exp | 47 --------------------------------------- test/profiles/profile_appname.exp | 4 ---- 3 files changed, 54 deletions(-) delete mode 100755 test/environment/shell-none.exp (limited to 'test') diff --git a/test/environment/environment.sh b/test/environment/environment.sh index 2b77973ac..9e58fdf95 100755 --- a/test/environment/environment.sh +++ b/test/environment/environment.sh @@ -36,9 +36,6 @@ echo "TESTING: extract command (extract_command.exp)" echo "TESTING: environment variables (test/environment/env.exp)" ./env.exp -echo "TESTING: shell none(test/environment/shell-none.exp)" -./shell-none.exp - which dash 2>/dev/null if [ "$?" -eq 0 ]; then diff --git a/test/environment/shell-none.exp b/test/environment/shell-none.exp deleted file mode 100755 index 512e2efc2..000000000 --- a/test/environment/shell-none.exp +++ /dev/null @@ -1,47 +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 -spawn $env(SHELL) -match_max 100000 - -send -- "firejail --shell=none\r" -expect { - timeout {puts "TESTING ERROR 0\n";exit} - "shell=none configured, but no program specified" -} -sleep 1 - -send -- "firejail --profile=shell-none.profile\r" -expect { - timeout {puts "TESTING ERROR 1\n";exit} - "shell=none configured, but no program specified" -} -after 100 - -send -- "firejail --shell=none ls\r" -expect { - timeout {puts "TESTING ERROR 2\n";exit} - -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" -} -expect { - timeout {puts "TESTING ERROR 3\n";exit} - "environment.sh" -} -after 100 - -send -- "firejail --profile=shell-none.profile ls\r" -expect { - timeout {puts "TESTING ERROR 4\n";exit} - -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms" -} -expect { - timeout {puts "TESTING ERROR 5\n";exit} - "environment.sh" -} -after 100 - - -puts "\nall done\n" diff --git a/test/profiles/profile_appname.exp b/test/profiles/profile_appname.exp index fce278b4c..c178e8e00 100755 --- a/test/profiles/profile_appname.exp +++ b/test/profiles/profile_appname.exp @@ -16,10 +16,6 @@ expect { timeout {puts "TESTING ERROR 1\n";exit} "Reading profile /etc/firejail/firefox-common.profile" } -expect { - timeout {puts "TESTING ERROR 2\n";exit} - "shell=none configured, but no program specified" -} after 100 puts "\nall done\n" -- cgit v1.2.3-70-g09d2