Merge branch 'master' of https://github.com/schollz/find

catmullet · Feb 10, 2017 · 683de11 · 683de11
2 parents cc5ef3e + 55be08a
commit 683de11
Show file tree

Hide file tree

Showing 5 changed files with 701 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ SOURCES := $(shell find $(SOURCEDIR) -name '*.go')
 
 BINARY=findserver
 
-VERSION=2.4
+VERSION=2.4.1
 BUILD_TIME=`date +%FT%T%z`
 BUILD=`git rev-parse HEAD`
 

diff --git a/fingerprint_test.go b/fingerprint_test.go
@@ -163,7 +163,7 @@ func TestLearnFingerprintPOST(t *testing.T) {
 	resp := httptest.NewRecorder()
 	router.ServeHTTP(resp, req)
 	response := "{\"message\":\"Inserted fingerprint containing 18 APs for zack (find) at zakhome floor 2 office\",\"success\":true}"
-	assert.Equal(t, resp.Body.String(), response)
+	assert.Equal(t, response, resp.Body.String())
 }
 
 func TestLearnFingerprint(t *testing.T) {

diff --git a/testing/calculate.sh b/testing/calculate.sh
@@ -0,0 +1,13 @@
+curl http://127.0.0.1:8003/calculate?group=testdb
+curl http://127.0.0.1:8003/calculate?group=testdb
+curl http://127.0.0.1:8003/calculate?group=testdb
+curl http://127.0.0.1:8003/calculate?group=testdb
+curl http://127.0.0.1:8003/calculate?group=testdb
+curl http://127.0.0.1:8003/calculate?group=testdb
+curl http://127.0.0.1:8003/calculate?group=testdb
+curl http://127.0.0.1:8003/calculate?group=testdb
+curl http://127.0.0.1:8003/calculate?group=testdb
+curl http://127.0.0.1:8003/calculate?group=testdb
+curl http://127.0.0.1:8003/calculate?group=testdb
+curl http://127.0.0.1:8003/calculate?group=testdb
+curl http://127.0.0.1:8003/calculate?group=testdb