move common code to build_test_env.sh

rhansen · rhansen · commit 26999bf0132e · 2016-01-31T16:07:43.000-05:00
Note that build_test_env.sh now creates and prepares the Python
virtualenv (it didn't before).
diff --git a/tools/build_test_env.sh b/tools/build_test_env.sh
@@ -33,12 +33,26 @@ case $PY_VER in
         exit 1;;
 esac
 
+VENV=$(pwd)/.venv
+
+cleanup() {
+    rm -f /tmp/python-gitlab.cfg
+    docker kill gitlab-test >/dev/null 2>&1
+    docker rm gitlab-test >/dev/null 2>&1
+    deactivate || true
+    rm -rf $VENV
+}
+[ -z "${BUILD_TEST_ENV_AUTO_CLEANUP+set}" ] || {
+    trap cleanup EXIT
+}
+
 docker run --name gitlab-test --detach --publish 8080:80 \
     --publish 2222:22 gpocentek/test-python-gitlab:latest >/dev/null 2>&1
 
 LOGIN='root'
 PASSWORD='5iveL!fe'
 CONFIG=/tmp/python-gitlab.cfg
+GITLAB="gitlab --config-file $CONFIG"
 GREEN='\033[0;32m'
 NC='\033[0m'
 OK="echo -e ${GREEN}OK${NC}"
@@ -74,3 +88,10 @@ EOF
 
 echo "Config file content ($CONFIG):"
 cat $CONFIG
+
+$VENV_CMD $VENV
+. $VENV/bin/activate
+pip install -rrequirements.txt
+pip install -e .
+
+sleep 20
diff --git a/tools/functional_tests.sh b/tools/functional_tests.sh
@@ -14,35 +14,10 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-cleanup() {
-    rm -f /tmp/python-gitlab.cfg
-    docker kill gitlab-test >/dev/null 2>&1
-    docker rm gitlab-test >/dev/null 2>&1
-    deactivate || true
-    rm -rf $VENV
-}
-trap cleanup EXIT
-
 setenv_script=$(dirname $0)/build_test_env.sh
-
+BUILD_TEST_ENV_AUTO_CLEANUP=true
 . $setenv_script "$@"
 
-CONFIG=/tmp/python-gitlab.cfg
-GITLAB="gitlab --config-file $CONFIG"
-GREEN='\033[0;32m'
-NC='\033[0m'
-OK="echo -e ${GREEN}OK${NC}"
-
-VENV=$(pwd)/.venv
-
-$VENV_CMD $VENV
-. $VENV/bin/activate
-pip install -rrequirements.txt
-pip install -e .
-
-# NOTE(gpocentek): the first call might fail without a little delay
-sleep 20
-
 set -e
 
 echo -n "Testing project creation... "
diff --git a/tools/py_functional_tests.sh b/tools/py_functional_tests.sh
@@ -14,26 +14,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-cleanup() {
-    rm -f /tmp/python-gitlab.cfg
-    docker kill gitlab-test >/dev/null 2>&1
-    docker rm gitlab-test >/dev/null 2>&1
-    deactivate || true
-    rm -rf $VENV
-}
-trap cleanup EXIT
-
 setenv_script=$(dirname $0)/build_test_env.sh
-
+BUILD_TEST_ENV_AUTO_CLEANUP=true
 . $setenv_script "$@"
 
-VENV=$(pwd)/.venv
-
-$VENV_CMD $VENV
-. $VENV/bin/activate
-pip install -rrequirements.txt
-pip install -e .
-
-sleep 20
-
 python $(dirname $0)/python_test.py
