More tweaks to tests... just about ready to run at scale.

3 files changed, 7 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index 89ab049f..87e387a6 100755
--- a/.gitignore
+++ b/.gitignore
@@ -53,6 +53,7 @@ node_modules
 cluster-geo/cluster-geo/config.js
 cluster-geo/cluster-geo/cache.*
 tests/http/zerotier-one
+tests/http/result_*
 
 # MacGap wrapper build files
 /ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/*
diff --git a/tests/http/agent.js b/tests/http/agent.js
index 53b2e9f9..061c7ba7 100644
--- a/tests/http/agent.js
+++ b/tests/http/agent.js
@@ -217,6 +217,7 @@ var expressServer = app.listen(AGENT_PORT,agentIdToIp(thisAgentId),function () {
 			console.error('FATAL: unable to contact or query server: '+err.toString());
 			process.exit(1);
 		}
+		doTestsAndReport();
 		setInterval(doTestsAndReport,TEST_INTERVAL);
 	});
 });
diff --git a/tests/http/server.js b/tests/http/server.js
index 6211b4ee..69ccf527 100644
--- a/tests/http/server.js
+++ b/tests/http/server.js
@@ -41,15 +41,15 @@ app.post('/:testNumber/:agentId',function(req,res) {
 	}
 	result = {
 		agentId: agentId,
-		testNumber: testNumber,
+		testNumber: parseInt(testNumber),
 		receiveTime: receiveTime,
 		results: resultData
 	};
 
-	var nows = receiveTime.toString(16);
-	while (nows.length < 16)
-		nows = '0' + nows;
-	fs.writeFile('result_'+agentId+'_'+nows,JSON.stringify(result),function(err) {
+	testNumber = testNumber.toString();
+	while (testNumber.length < 10)
+		testNumber = '0' + testNumber;
+	fs.writeFile('result_'+testNumber+'_'+agentId,JSON.stringify(result),function(err) {
 		console.log(result);
 	});