Merge pull request mozilla-services#198 from mozilla-services/1062461…

…-test-fails-when-server-running Bug 1062461 — Change default server port for tests.
Micheletto · Sep 10, 2014 · 5e6716d · 5e6716d
2 parents 2964674 + ef94451
commit 5e6716d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -19,7 +19,7 @@ install:
 
 .PHONY: lint
 lint:
-	@grunt lint
+	@$(NODE_LOCAL_BIN)/grunt lint
 
 clean:
 	rm -rf .venv node_modules coverage lib-cov html-report
@@ -33,7 +33,7 @@ cover-mocha:
 
 .PHONY: eslint
 eslint:
-	@grunt eslint
+	@$(NODE_LOCAL_BIN)/grunt eslint
 
 .PHONY: mocha
 mocha:

diff --git a/config/test.json b/config/test.json
@@ -1,6 +1,6 @@
 {
   "host": "localhost",
-  "port": 5000,
+  "port": 0,
   "storage": {
     "engine": "redis",
     "settings": {

diff --git a/package.json b/package.json
@@ -40,6 +40,7 @@
   "devDependencies": {
     "chai": "1.9.x",
     "grunt": "0.4.5",
+    "grunt-cli": "0.1.13",
     "grunt-copyright": "0.1.0",
     "grunt-eslint": "1.0.0",
     "grunt-jsonlint": "1.0.4",