From 96b67ed4ed768e0d37c6e22334031cd302982509 Mon Sep 17 00:00:00 2001 From: netblue30 Date: Tue, 6 Dec 2016 11:07:25 -0500 Subject: fixes --- test/environment/firejail-in-firejail.exp | 27 ++++++++++++++++++++++++++- test/environment/firejail-in-firejail2.exp | 29 ++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/environment/firejail-in-firejail.exp b/test/environment/firejail-in-firejail.exp index 1122b712f..2b851ee72 100755 --- a/test/environment/firejail-in-firejail.exp +++ b/test/environment/firejail-in-firejail.exp @@ -16,9 +16,34 @@ sleep 1 send -- "firejail\r" expect { - timeout {puts "TESTING ERROR 1\n";exit} + timeout {puts "TESTING ERROR 2\n";exit} "Warning: an existing sandbox was detected" } after 100 +send -- "exit\r" +after 100 + +send -- "firejail --force\r" +expect { + timeout {puts "TESTING ERROR 3\n";exit} + "cannot rise privileges" +} +after 100 + +send -- "firejail --version\r" +expect { + timeout {puts "TESTING ERROR 4\n";exit} + "firejail version" +} +after 100 + +send -- "firejail --version --force\r" +expect { + timeout {puts "TESTING ERROR 5\n";exit} + "firejail version" +} +after 100 + + puts "\nall done\n" diff --git a/test/environment/firejail-in-firejail2.exp b/test/environment/firejail-in-firejail2.exp index 37d1c2870..330e5e372 100755 --- a/test/environment/firejail-in-firejail2.exp +++ b/test/environment/firejail-in-firejail2.exp @@ -14,11 +14,38 @@ expect { } sleep 1 +send -- "firejail\r" +expect { + timeout {puts "TESTING ERROR 2\n";exit} + "Warning: an existing sandbox was detected" +} +after 100 + +send -- "exit\r" +after 100 + send -- "firejail --force\r" expect { - timeout {puts "TESTING ERROR 1\n";exit} + timeout {puts "TESTING ERROR 3\n";exit} "Child process initialized" } after 100 +send -- "exit\r" +after 100 + +send -- "firejail --version\r" +expect { + timeout {puts "TESTING ERROR 4\n";exit} + "firejail version" +} +after 100 + +send -- "firejail --version --force\r" +expect { + timeout {puts "TESTING ERROR 5\n";exit} + "firejail version" +} +after 100 + puts "\nall done\n" -- cgit v1.2.3-54-g00ecf