From e3251668e71a797a89d4ffb63f974656d9c52edf Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Sun, 4 May 2014 15:19:46 +0530
Subject: [PATCH] Fixes to Travis

---
 .travis.yml                       | 12 ++++++------
 frappe/cli.py                     | 14 ++++++++++++--
 frappe/tests/test_client_login.py |  4 ++--
 frappe/utils/sel.py               |  3 +++
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1f139860e7..9fb42a9218 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,12 +19,12 @@ install:
   - pip install --editable .
 
 script:
-  cd ./test_sites/ &&
-  frappe --use test_site &&
-  frappe --reinstall &&
-  frappe -b &&
-  frappe --serve --port 8888 & &&
-  frappe --verbose --run_tests
+  - cd ./test_sites/
+  - frappe --use test_site
+  - frappe --reinstall
+  - frappe -b
+  - frappe --serve_test &
+  - frappe --verbose --run_tests
 
 before_script:
   - mysql -e 'create database test_frappe'
diff --git a/frappe/cli.py b/frappe/cli.py
index 3cbcfd7bc3..1cda01b2fa 100755
--- a/frappe/cli.py
+++ b/frappe/cli.py
@@ -154,10 +154,12 @@ 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("--serve_test", action="store_true", help="Run development server for testing")
+
 
 def setup_utilities(parser):
 	# serving
-	parser.add_argument("--port", default=8000, type=int, help="port for development server")
+	parser.add_argument("--port", type=int, help="port for development server")
 	parser.add_argument("--use", action="store_true", help="Set current site for development.")
 
 	# update
@@ -721,10 +723,18 @@ def run_tests(app=None, module=None, doctype=None, verbose=False, tests=()):
 	return ret
 
 @cmd
-def serve(port=8000, profile=False, sites_path='.', site=None):
+def serve(port=None, profile=False, sites_path='.', site=None):
+	if not port: port = 8000
+
 	import frappe.app
 	frappe.app.serve(port=port, profile=profile, site=frappe.local.site, sites_path=sites_path)
 
+@cmd
+def serve_test(port=None, profile=False, sites_path='.', site=None):
+	from frappe.utils import sel
+	if not port: port = sel.port
+	serve(port)
+
 @cmd
 def request(args):
 	import frappe.handler
diff --git a/frappe/tests/test_client_login.py b/frappe/tests/test_client_login.py
index b26359e25e..13fa82777c 100644
--- a/frappe/tests/test_client_login.py
+++ b/frappe/tests/test_client_login.py
@@ -6,10 +6,10 @@ from frappe.utils import sel
 
 class TestLogin(unittest.TestCase):
 	def setUp(self):
-		sel.login(frappe.local.localhost)
+		sel.login(sel.get_localhost())
 
 	def test_login(self):
-		self.assertEquals(sel.driver.current_url, frappe.local.localhost + "/desk")
+		self.assertEquals(sel.driver.current_url, sel.get_localhost() + "/desk")
 
 	def test_to_do(self):
 		sel.module("ToDo")
diff --git a/frappe/utils/sel.py b/frappe/utils/sel.py
index 30e6385cd9..00fefa96cf 100644
--- a/frappe/utils/sel.py
+++ b/frappe/utils/sel.py
@@ -24,6 +24,9 @@ logged_in = False
 cur_route = False
 input_wait = 0
 
+def get_localhost():
+	return "{host}:{port}".format(host, port)
+
 def start(verbose=None, driver="PhantomJS"):
 	global _driver, _verbose
 	_verbose = verbose