wait for server startup

linkernetworks · Sep 1, 2018 · b952417 · b952417
1 parent 4f3480c
commit b952417
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -87,6 +87,8 @@ src.test-coverage-vagrant:
 src.test-bats:
 	sed -i.bak "s/localhost:9090/$$(minikube ip):30003/g; s/localhost:27017/$$(minikube ip):31717/g" config/testing.json
 	./build/src/cmd/vortex/vortex -config config/testing.json -port 7890 &
+	@echo "Waiting for server startup"
+	sleep 1
 	@cd tests;\
 	./test.sh
 

diff --git a/src/server/handler_user.go b/src/server/handler_user.go
@@ -28,12 +28,12 @@ func signUpUserHandler(ctx *web.Context) {
 		return
 	}
 
-	encryptedPassword, err := utils.HashPassword(user.LoginCredential.Password)
+	hashedPassword, err := utils.HashPassword(user.LoginCredential.Password)
 	if err != nil {
 		response.BadRequest(req.Request, resp.ResponseWriter, err)
 		return
 	}
-	user.LoginCredential.Password = encryptedPassword
+	user.LoginCredential.Password = hashedPassword
 
 	user.LoginCredential.Username = strings.ToLower(user.LoginCredential.Username)
 
@@ -134,12 +134,12 @@ func createUserHandler(ctx *web.Context) {
 		return
 	}
 
-	encryptedPassword, err := utils.HashPassword(user.LoginCredential.Password)
+	hashedPassword, err := utils.HashPassword(user.LoginCredential.Password)
 	if err != nil {
 		response.BadRequest(req.Request, resp.ResponseWriter, err)
 		return
 	}
-	user.LoginCredential.Password = encryptedPassword
+	user.LoginCredential.Password = hashedPassword
 
 	user.LoginCredential.Username = strings.ToLower(user.LoginCredential.Username)