From ab74adb59d0bc2d76a2947c7156b4c40b927e07b Mon Sep 17 00:00:00 2001
From: Filippo Squillace <squillace.filippo@gmail.com>
Date: Fri, 28 Nov 2014 00:03:19 +0100
Subject: [PATCH 1/2] Fix issue #25

---
 tests/test_core.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tests/test_core.sh b/tests/test_core.sh
index fac8dbc..d90e816 100755
--- a/tests/test_core.sh
+++ b/tests/test_core.sh
@@ -55,10 +55,13 @@ function test_setup_juju(){
     [ -e $JUJU_HOME/run/lock ] || return 1
 
     export -f setup_juju
+    export -f die
     JUJU_ENV=1 bash -ic "setup_juju" &> /dev/null
     is_equal $? 1 || return 1
     export -n setup_juju
     unset setup_juju
+    export -n die
+    unset die
 }
 
 
@@ -70,6 +73,7 @@ function test_setup_from_file_juju(){
     [ -e $JUJU_HOME/run/lock ] || return 1
 
     export -f setup_from_file_juju
+    export -f die
     bash -ic "setup_from_file_juju noexist.tar.gz" &> /dev/null
     is_equal $? 1 || return 1
 
@@ -77,6 +81,8 @@ function test_setup_from_file_juju(){
     is_equal $? 1 || return 1
     export -n setup_from_file_juju
     unset setup_from_file_juju
+    export -n die
+    unset die
 }
 
 
@@ -158,10 +164,13 @@ function test_delete_juju(){
     is_equal $? 1 || return 1
 
     export -f delete_juju
+    export -f die
     JUJU_ENV=1 bash -ic "delete_juju" &> /dev/null
     is_equal $? 1 || return 1
+    export -n delete_juju
     unset delete_juju
-    unset delete_juju
+    export -n die
+    unset die
 }
 
 

From e96431a346f05fa83fba17ea3fda29e0ff62b9a5 Mon Sep 17 00:00:00 2001
From: Filippo Squillace <squillace.filippo@gmail.com>
Date: Fri, 28 Nov 2014 16:05:18 +0100
Subject: [PATCH 2/2] Fix #25 tests for old bash version

---
 tests/test_core.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/test_core.sh b/tests/test_core.sh
index d90e816..fba5f0d 100755
--- a/tests/test_core.sh
+++ b/tests/test_core.sh
@@ -99,10 +99,13 @@ function test_run_juju_as_root(){
     [ -e $JUJU_HOME/${HOME} ] || return 1
 
     export -f run_juju_as_root
+    export -f die
     JUJU_ENV=1 bash -ic "run_juju_as_root" &> /dev/null
     is_equal $? 1 || return 1
     export -n run_juju_as_root
     unset run_juju_as_root
+    export -n die
+    unset die
 }
 
 function test_run_juju_as_user(){
@@ -132,19 +135,24 @@ function test_run_juju_as_user_proot_args(){
     is_equal $? 0 || return 1
 
     export -f _run_juju_with_proot
+    export PROOT
+    export TRUE
     ID="/usr/bin/echo 0" bash -ic "_run_juju_with_proot" &> /dev/null
     is_equal $? 1 || return 1
     export -n _run_juju_with_proot
     unset _run_juju_with_proot
+    export -n PROOT
+    export -n TRUE
 }
 
 function test_run_juju_as_user_seccomp(){
     install_mini_juju
-    local output=$(run_juju_as_user "" "env" | grep "PROOT_NO_SECCOMP")
+    PROOT=""
+    local output=$(_run_juju_with_proot "" "env" | grep "PROOT_NO_SECCOMP")
     is_equal $output "" || return 1
 
     TRUE="/usr/bin/false"
-    local output=$(run_juju_as_user "" "env" | grep "PROOT_NO_SECCOMP")
+    local output=$(_run_juju_with_proot "" "env" | grep "PROOT_NO_SECCOMP")
     is_equal $output "PROOT_NO_SECCOMP=1" || return 1
 }