From b12dcfc7b3a7fcb1fb5dd003677781a25d6bbd6b Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Sun, 4 May 2014 15:03:37 +0530
Subject: [PATCH] Travis: start serve at port 8888

---
 .travis.yml   |  1 +
 frappe/cli.py | 10 +++-------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d4472c6cd8..1f139860e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,7 @@ script:
   frappe --use test_site &&
   frappe --reinstall &&
   frappe -b &&
+  frappe --serve --port 8888 & &&
   frappe --verbose --run_tests
 
 before_script:
diff --git a/frappe/cli.py b/frappe/cli.py
index 476e0c3a08..3cbcfd7bc3 100755
--- a/frappe/cli.py
+++ b/frappe/cli.py
@@ -154,8 +154,6 @@ def setup_test(parser):
 		help="Run command for specified module")
 	parser.add_argument("--tests", metavar="TEST FUNCTION", nargs="*",
 		help="Run one or more specific test functions")
-	parser.add_argument("--without_serve", default=False, action="store_true",
-		help="Run tests assuming serve is executed manually on port 8888")
 
 def setup_utilities(parser):
 	# serving
@@ -705,12 +703,11 @@ def smtp_debug_server():
 	os.execv(python, [python, '-m', "smtpd", "-n", "-c", "DebuggingServer", "localhost:25"])
 
 @cmd
-def run_tests(app=None, module=None, doctype=None, verbose=False, tests=(), without_serve=False):
+def run_tests(app=None, module=None, doctype=None, verbose=False, tests=()):
 	import frappe.test_runner
 	from frappe.utils import sel
 
-	if not without_serve:
-		sel.start(verbose)
+	sel.start(verbose)
 
 	ret = 1
 	try:
@@ -719,8 +716,7 @@ def run_tests(app=None, module=None, doctype=None, verbose=False, tests=(), with
 		if len(ret.failures) == 0 and len(ret.errors) == 0:
 			ret = 0
 	finally:
-		if not without_serve:
-			sel.close()
+		sel.close()
 
 	return ret