Fix CLI exits with status 0 when error occurs (#1393)

test/tests/test_specs/test_spec_merge/test_spec_merge.sh

@@ -9,8 +9,8 @@ fn_nd=nodehellond
 
 cleanup() {
     echo "Cleaning up..."
-    popd
     fission spec destroy || true
+    popd
 }
 
 trap cleanup EXIT
@@ -35,4 +35,4 @@ hnp=$(kubectl -n $FUNCTION_NAMESPACE get deployment -l=environmentName=$env_p -o
 if [[ "${hnp}" == "foo-bar" ]]
     then
         echo "Hostname matches for poolmgr function, podspec test 2/2 passsed"
-    fi    
+    fi