Even more test cleanup

Makefile

@@ -1,15 +1,15 @@
-TEST_KEY=sr_test_fun
 TEST_SCENARIOS="[1-8]*"
+TEST_URL='ws://localhost:9001/'
 
 test:
 
-	bash ./TestSupport/run_test.sh $(TEST_SCENARIOS) $(TEST_KEY)
+	bash ./TestSupport/run_test.sh $(TEST_SCENARIOS) $(TEST_URL)
 	mkdir -p pages/results
 	open pages/results/index.html
 
 test_all:
 
-	bash ./TestSupport/run_test.sh '*' $(TEST_KEY) $(SDK)
+	bash ./TestSupport/run_test.sh '*' $(TEST_URL)
 	mkdir -p pages/results
 	open pages/results/index.html
 

TestSupport/run_test.sh

@@ -1,14 +1,14 @@
 export MACOSX_DEPLOYMENT_TARGET="10.7"
 
 TEST_SCENARIOS=$1
-TEST_KEY=$2
+TEST_URL=$2
 SDK=$3
 
-export SR_TESTHARNESS_KEY=$TEST_KEY
+export SR_TEST_URL=$TEST_URL
 
 bash TestSupport/ensure_virtualenv.sh .env
 
-.env/bin/sr-testharness -k $TEST_KEY -i '' -c "$TEST_SCENARIOS" &
+.env/bin/sr-testharness -i '' -c "$TEST_SCENARIOS" &
 
 CHILD_PID=$!