From 294dce8859c3e9aa22bb32d7485903f6fb5e7e25 Mon Sep 17 00:00:00 2001 From: Reiner Herrmann Date: Thu, 15 Jun 2017 15:53:18 +0200 Subject: test: minor cleanup/fixes --- test/arguments/joinrun.exp | 4 ---- test/arguments/joinrun.sh | 10 +++++----- test/arguments/outrun.sh | 6 +++--- 3 files changed, 8 insertions(+), 12 deletions(-) (limited to 'test') diff --git a/test/arguments/joinrun.exp b/test/arguments/joinrun.exp index 097becacc..97972e5e8 100755 --- a/test/arguments/joinrun.exp +++ b/test/arguments/joinrun.exp @@ -35,10 +35,6 @@ expect { timeout {puts "TESTING ERROR 3.2.3\n";exit} "#arg2 tail#" } - -# todo: remove exit and fix it -exit - expect { timeout {puts "TESTING ERROR 3.3.1\n";exit} "Arguments:" diff --git a/test/arguments/joinrun.sh b/test/arguments/joinrun.sh index 3ed166839..b00ea0e80 100755 --- a/test/arguments/joinrun.sh +++ b/test/arguments/joinrun.sh @@ -5,18 +5,18 @@ firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --join=joinrun faudit arg1 arg2 # simple quotes, testing spaces in file names echo "TESTING: 3.2 - args with space and \"" -firejail--env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit "arg1 tail" "arg2 tail" +firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --join=joinrun faudit "arg1 tail" "arg2 tail" echo "TESTING: 3.3 - args with space and '" -firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit 'arg1 tail' 'arg2 tail' +firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --join=joinrun faudit 'arg1 tail' 'arg2 tail' # escaped space in file names echo "TESTING: 3.4 - args with space and \\" -firejail--env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit arg1\ tail arg2\ tail +firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --join=joinrun faudit arg1\ tail arg2\ tail # & char appears in URLs - URLs should be quoted echo "TESTING: 3.5 - args with & and \"" -firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit "arg1&tail" "arg2&tail" +firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --join=joinrun faudit "arg1&tail" "arg2&tail" echo "TESTING: 3.6 - args with & and '" -firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit 'arg1&tail' 'arg2&tail' +firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --join=joinrun faudit 'arg1&tail' 'arg2&tail' diff --git a/test/arguments/outrun.sh b/test/arguments/outrun.sh index e2b3046d6..5bc3b1e37 100755 --- a/test/arguments/outrun.sh +++ b/test/arguments/outrun.sh @@ -8,15 +8,15 @@ echo "TESTING: 4.2 - args with space and \"" firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit "arg1 tail" "arg2 tail" echo "TESTING: 4.3 - args with space and '" -firejail--env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit 'arg1 tail' 'arg2 tail' +firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit 'arg1 tail' 'arg2 tail' # escaped space in file names echo "TESTING: 4.4 - args with space and \\" -firejail--env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit arg1\ tail arg2\ tail +firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit arg1\ tail arg2\ tail # & char appears in URLs - URLs should be quoted echo "TESTING: 4.5 - args with & and \"" firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit "arg1&tail" "arg2&tail" echo "TESTING: 4.6 - args with & and '" -firejail--env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit 'arg1&tail' 'arg2&tail' +firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit 'arg1&tail' 'arg2&tail' -- cgit v1.2.3-54-g00ecf