(#47) [WIP] change test execution to prevent insufficient permission …

…issues when linking into volume
sakuli · Jul 27, 2020 · 34d1c7e · 34d1c7e
1 parent 57e705e
commit 34d1c7e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 18 deletions.
diff --git a/Dockerfile.sakuli-ubuntu-openbox b/Dockerfile.sakuli-ubuntu-openbox
@@ -34,9 +34,13 @@ ENV HOME=/headless \
     VNC_PW=vncpassword \
     VNC_VIEW_ONLY=false \
     NPM_TOKEN=REPLACE_WITH_YOUR_NPM_TOKEN \
-    IMG=taconsol/sakuli
+    IMG=taconsol/sakuli \
+    EXECUTION_DIR=/testsuite_execution
 WORKDIR $HOME
 
+### Create EXECUTION_DIR and set permissions correctly
+RUN mkdir ${EXECUTION_DIR} && chmod 777 ${EXECUTION_DIR}
+
 ### Copy all install scripts for further steps
 COPY ./src/common/install/ $INST_SCRIPTS/
 RUN find $INST_SCRIPTS -name '*.sh' -exec chmod a+x {} +

diff --git a/src/common/install/setup.sh b/src/common/install/setup.sh
@@ -13,7 +13,7 @@ function install {
 apt-get update -y
 apt-get upgrade -y
 echo "===> Installing common tools"
-install wget locales gnome-calculator xfce4-screenshooter git nitrogen
+install wget locales gnome-calculator xfce4-screenshooter git nitrogen rsync
 
 echo "===> Installing libnss3-tool"
 install libnss3-tools

diff --git a/src/common/scripts/startup.sh b/src/common/scripts/startup.sh
@@ -9,11 +9,8 @@ if [ $# -gt 0 ]; then
 	# pass all parameters
 	main "$@"
 else
-	# no parameters
-	# - run the suite defined by $SAKULI_TEST_SUITE, if set
-	# or
-	# - run the example case (fallback)
-	pushd ${SAKULI_TEST_SUITE:-$HOME/demo_testcase}
+	# no parameters: Run test project placed in ${EXECUTION_DIR}
+  pushd ${EXECUTION_DIR}
 	main npm test
 	popd
 fi
diff --git a/src/common/scripts/vnc_startup.sh b/src/common/scripts/vnc_startup.sh
@@ -107,11 +107,12 @@ fi
 
 # Link global node_modules into the actual test suite
 if [ "${SAKULI_TEST_SUITE}" ]; then
-  if [ -d ${SAKULI_TEST_SUITE}/node_modules ]; then
-    mv ${SAKULI_TEST_SUITE}/node_modules ${SAKULI_TEST_SUITE}/node_modules_bak
-  fi
-  ln -s $(npm root -g | head -n 1) ${SAKULI_TEST_SUITE}/node_modules
+  rsync -avqO ${SAKULI_TEST_SUITE}/* ${EXECUTION_DIR} --exclude node_modules
+else
+  # Ensure nothing breaks if user mounts into ${HOME}/demo_testcase for any reason
+  rsync -avqO ${HOME}/demo_testcase/* ${EXECUTION_DIR} --exclude node_modules
 fi
+ln -s $(npm root -g | head -n 1) ${EXECUTION_DIR}/node_modules
 
 set +e
 
@@ -124,13 +125,7 @@ else
     $@
 fi
 
-# Remove the link to the actual test suite as it is most likely a mounted volume
-if [ -d ${SAKULI_TEST_SUITE}/node_modules ]; then
-  rm -r ${SAKULI_TEST_SUITE}/node_modules
-fi
+# TODO: Distribute logs back to volume, if possible
 
-if [ -d ${SAKULI_TEST_SUITE}/node_modules_bak ]; then
-    mv ${SAKULI_TEST_SUITE}/node_modules_bak ${SAKULI_TEST_SUITE}/node_modules
-fi
 
 set -e