Adding database update lock support to the test setup/teardown files

levkowetz · levkowetz · commit f1251ca2d660 · 2007-06-12T16:21:25.000Z
- Legacy-Id: 334
diff --git a/test/shell-utils b/test/shell-utils
@@ -10,6 +10,7 @@ function err() {
 	echo "$program: Error: $*" 1>&2; 
 	exit 2
 }
+alias die='err'
 
 function warn() { 
 	echo "$program: Warning: $*" 1>&2; 
diff --git a/test/test-setup b/test/test-setup
@@ -47,9 +47,32 @@ say "Setting up the Django settings for the test suite"
 cd $build
 
 settings_local=$(py_module_file "settings_local")
-[ "$settings_local" ] || err
+[ "$settings_local" ] || die "No setting_local file available"
 
 cat $settings_local test/settings_local_test.py > ietf/settings_local.py
 
+# Acquire lock, to prevent running test and database update at the same time
+
+LOCKDIR=$build/test/update-db.lock
+PIDFILE=$build/test/update-db.lock/pid
+
+while true; do
+    if mkdir $build/test/update-db.lock; then
+	echo "$$" > $PIDFILE
+	break
+    else
+	pid=$(< $PIDFILE ) || die "Couldn't read pidfile '$PIDFILE'"
+	if kill -0 $pid; then
+	    echo "Pidfile for process $pid exists, and process is running. Sleeping."
+	    sleep 10
+	else
+	    echo "Pidfile for process $pid exists, but process isn't running."
+	    echo "Removing lock and old pid file $pidfile."
+	    rm -rf $LOCKDIR
+	    break 
+	fi
+    fi
+done
+
 
 exit $warnings
diff --git a/test/test-teardown b/test/test-teardown
@@ -19,4 +19,9 @@ if echo "show databases;" | python ietf/manage.py dbshell | grep test_ietf; then
     echo "test database removed."
 fi
 
+# Release database update lock
+
+LOCKDIR=$build/test/update-db.lock
+rm -rf $LOCKDIR
+
 exit $warnings

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ function err() {`
`10`	`10`	`echo "$program: Error: $*" 1>&2;`
`11`	`11`	`exit 2`
`12`	`12`	`}`
	`13`	`+alias die='err'`
`13`	`14`
`14`	`15`	`function warn() {`
`15`	`16`	`echo "$program: Warning: $*" 1>&2;`