From 24a1b2b397232b43713e83a9ba92e0101623ae87 Mon Sep 17 00:00:00 2001
From: Filippo Squillace <squillace.filippo@gmail.com>
Date: Thu, 27 Nov 2014 22:48:48 +0100
Subject: [PATCH] Fix issue #21

---
 tests/test_core.sh | 5 +++++
 tests/test_juju.sh | 7 +++++++
 tests/test_util.sh | 3 +++
 3 files changed, 15 insertions(+)

diff --git a/tests/test_core.sh b/tests/test_core.sh
index bce0368..fac8dbc 100755
--- a/tests/test_core.sh
+++ b/tests/test_core.sh
@@ -57,6 +57,7 @@ function test_setup_juju(){
     export -f setup_juju
     JUJU_ENV=1 bash -ic "setup_juju" &> /dev/null
     is_equal $? 1 || return 1
+    export -n setup_juju
     unset setup_juju
 }
 
@@ -74,6 +75,7 @@ function test_setup_from_file_juju(){
 
     JUJU_ENV=1 bash -ic "setup_from_file_juju" &> /dev/null
     is_equal $? 1 || return 1
+    export -n setup_from_file_juju
     unset setup_from_file_juju
 }
 
@@ -93,6 +95,7 @@ function test_run_juju_as_root(){
     export -f run_juju_as_root
     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
 }
 
@@ -125,6 +128,7 @@ function test_run_juju_as_user_proot_args(){
     export -f _run_juju_with_proot
     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
 }
 
@@ -157,6 +161,7 @@ function test_delete_juju(){
     JUJU_ENV=1 bash -ic "delete_juju" &> /dev/null
     is_equal $? 1 || return 1
     unset delete_juju
+    unset delete_juju
 }
 
 
diff --git a/tests/test_juju.sh b/tests/test_juju.sh
index 8d9a94a..38806f7 100755
--- a/tests/test_juju.sh
+++ b/tests/test_juju.sh
@@ -110,6 +110,7 @@ function test_check_cli(){
     export -f parse_arguments
     export -f execute_operation
     export -f wrap_juju
+    export -f die
     bash -ic "wrap_juju -b -h" &> /dev/null
     is_equal $? 1 || return 1
     bash -ic "wrap_juju -d -r" &> /dev/null
@@ -124,6 +125,12 @@ function test_check_cli(){
     is_equal $? 1 || return 1
     bash -ic "wrap_juju -d args" &> /dev/null
     is_equal $? 1 || return 1
+    export -n check_cli
+    export -n parse_arguments
+    export -n execute_operation
+    export -n wrap_juju
+    export -n die
+    unset die
 }
 
 for func in $(declare -F | grep test_ | awk '{print $3}' | xargs)
diff --git a/tests/test_util.sh b/tests/test_util.sh
index 757f08f..e7cfc1b 100755
--- a/tests/test_util.sh
+++ b/tests/test_util.sh
@@ -33,8 +33,11 @@ function test_die(){
     local actual=$(die "Test" 2>&1)
     local expected=$(echo -e "\033[1;31mTest\033[0m")
     is_equal "$actual" "$expected" || return 1
+    export -f die
     bash -ic "die Dying" &> /dev/null
     is_equal $? 1 || return 1
+    export -n die
+    unset die
     return 0
 }