Reverting these files to r792; commit [793] was unintentional.

 - Legacy-Id: 795
Note: SVN reference [793] has been migrated to Git commit 4cb27f5

Author: levkowetz

test/run

@@ -5,19 +5,15 @@ progdir=${0%/*}
 
 cd $progdir/..				# now at trunk/
 
-pidfile=$(test/test-setup)		# create a patched django for test purposes, and more
-[ "$pidfile" ] || die "Didn't get a pidfile name"
+test/test-setup			# create a patched django for test purposes, and more
 
 test/run-pyflakes ietf
 
 # Trap keyboard interrupt to ensure the test/teardown is run if we interrupt the tests
 trap 'echo "$program($LINENO): Caught Interrupt"' INT 
 
 # run tests with our patched django
-PYTHONPATH=test:test/lib URLPREFIX="$*" python ietf/manage.py test &
-pid=$!
-echo $pid > $pidfile
-wait $pid
+PYTHONPATH=test:test/lib URLPREFIX="$*" python ietf/manage.py test
 
 # reset keyboard interrupt trap
 trap INT

test/test-setup

@@ -66,17 +66,18 @@ while true; do
 	echo "$$" > $PIDFILE
 	chmod a+rwx $LOCKDIR
 	chmod a+rw $PIDFILE
-	echo $PIDFILE			# tell caller about the pidfile
 	break
     else
 	pid=$(< $PIDFILE )
 	[ "$pid" ] || die "Couldn't read pidfile '$PIDFILE'"
 	if kill -0 $pid; then
-	    say "Pidfile for process $pid exists, and process is running. Sleeping."
+	    echo "Pidfile for process $pid exists, and process is running. Sleeping."
 	    sleep 10
 	else
-	    say "Pidfile for process $pid exists, but process doesn't seem to be running."
-	    die "Remove lockdir $LOCKDIR and old pid file $pidfile."
+	    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