Fix for Travis CI issue: travis-ci/travis-cookbooks#876

nibb13 · Sep 30, 2017 · 772b55a · 772b55a
1 parent a084e8a
commit 772b55a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/ci/tests.sh b/ci/tests.sh
@@ -50,18 +50,10 @@ assert "./pushall.sh -c self -t \"Title\" -T \"Text\" -i \"http://test.com/icon.
 
 assert_end "Instant calls"
 
-SCRIPT_NAME=$(basename "$0")
-LOCKDIR_QUEUE="/var/lock/${SCRIPT_NAME}_queue"
+# Travis CI issue: https://github.com/travis-ci/travis-cookbooks/issues/876
 
-#mkdir $LOCKDIR_QUEUE
-
-#echo "mkdir status: $?"
-
-ls -la /var
-ls -la /run
-la -la /run/lock
-
-exit 0;
+mkdir -p ./ci/var/lock/
+export LOCKDIR_PREFIX="./ci"
 
 # Queue add
 assert_raises "./pushall.sh -c self -t \"Title\" -T \"Text\" -I \"pushall_id\" -K \"pushall_key\" queue 2>&1" 0

diff --git a/pushall.sh b/pushall.sh
@@ -13,9 +13,9 @@ _init () {
 	CONF_SCRIPT_DIR=".pushall.sh";
 	SCRIPT_DIR=$(dirname "$0")
 	SCRIPT_NAME=$(basename "$0")
-	LOCKDIR="/var/lock/${SCRIPT_NAME}"
+	LOCKDIR="$LOCKDIR_PREFIX/var/lock/${SCRIPT_NAME}"
 	PIDFILE="${LOCKDIR}/pid"
-	LOCKDIR_QUEUE="/var/lock/${SCRIPT_NAME}_queue"
+	LOCKDIR_QUEUE="$LOCKDIR_PREFIX/var/lock/${SCRIPT_NAME}_queue"
 	PIDFILE_QUEUE="${LOCKDIR_QUEUE}/pid"
 
 	if [ ! "$XDG_CONFIG_HOME" ]; then