Squashed commit of the following:

commit 73a36ea
Author: Rory Craig-Barnes <rcraigbarnes@blackberry.com>
Date:   Mon Mar 24 14:53:37 2014 -0400

    Missed a couple references to webserver.
    Updated network.py to include W3C copyright
    Added en0-en4 to interfaces to cover MacOS

commit 9016b47
Author: Rory Craig-Barnes <rcraigbarnes@blackberry.com>
Date:   Thu Mar 13 10:47:29 2014 -0400

    Making Python test webserver use host machines IP for testing instead of localhost. This will allow for remote devices to be used in testing

    Updated all tests to use new method.

Signed-off-by: Luke Inman-Semerau <luke.semerau@gmail.com>

Author: Rory Craig-Barnes

py/test/selenium/webdriver/browser_specific_template.py

@@ -19,10 +19,11 @@
 from selenium import webdriver
 from selenium.##PACKAGE_NAME## import ##GENERAL_FILENAME##
 from selenium.test.selenium.webdriver.common.webserver import SimpleWebServer
+from selenium.test.selenium.webdriver.common.network import get_lan_ip
 
 def setup_module(module):
     ##CUSTOM_TEST_SETUP##
-    webserver = SimpleWebServer()
+    webserver = SimpleWebServer(host=get_lan_ip())
     webserver.start()
     ##BROWSER_SPECIFIC_TEST_CLASS##.webserver = webserver
     ##BROWSER_SPECIFIC_TEST_CLASS##.driver = webdriver.##BROWSER_CONSTRUCTOR##
@@ -40,5 +41,5 @@ def teardown_module(module):
     try:
         ##BROWSER_SPECIFIC_TEST_CLASS##.webserver.stop()
     except AttributeError:
-        pass 
+        pass
     ##CUSTOM_TEST_TEARDOWN##

py/test/selenium/webdriver/common/alerts_tests.py

@@ -218,7 +218,7 @@ def _waitForAlert(self):
         return WebDriverWait(self.driver, 3).until(EC.alert_is_present())
 
     def _pageURL(self, name):
-        return "http://localhost:%d/%s.html" % (self.webserver.port, name)
+        return self.webserver.where_is(name + '.html')
 
     def _loadSimplePage(self):
         self._loadPage("simpleTest")

py/test/selenium/webdriver/common/api_example_tests.py

@@ -43,7 +43,7 @@ def testGetTitle(self):
     def testGetCurrentUrl(self):
         self._loadSimplePage()
         url = self.driver.current_url
-        self.assertEquals("http://localhost:%d/simpleTest.html" % self.webserver.port, url)
+        self.assertEquals(self.webserver.where_is('simpleTest.html'), url)
 
     def testFindElementsByXPath(self):
         self._loadSimplePage()
@@ -175,7 +175,8 @@ def testGetAttribute(self):
         self._loadPage(page)
         elem = self.driver.find_element_by_id("id1")
         attr = elem.get_attribute("href")
-        self.assertEquals("http://localhost:%d/xhtmlTest.html#" % self.webserver.port, attr)
+
+        self.assertEquals(self.webserver.where_is('xhtmlTest.html#'), attr)
 
     def testGetImplicitAttribute(self):
         self._loadPage("nestedElements")
@@ -264,7 +265,7 @@ def testGetLog(self):
             self.assertTrue(log)
 
     def _pageURL(self, name):
-        return "http://localhost:%d/%s.html" % (self.webserver.port, name)
+        return self.webserver.where_is(name + '.html')
 
     def _loadSimplePage(self):
         self._loadPage("simpleTest")

py/test/selenium/webdriver/common/appcache_tests.py

@@ -33,7 +33,7 @@ def testWeCanGetTheStatusOfTheAppCache(self):
 
 
     def _pageURL(self, name):
-        return "http://localhost:%d/%s.html" % (self.webserver.port, name)
+        return self.webserver.where_is(name + '.html')
 
     def _loadSimplePage(self):
         self._loadPage("simpleTest")

py/test/selenium/webdriver/common/children_finding_tests.py

@@ -233,8 +233,8 @@ def testShouldThrowAnErrorIfUserPassesInInvalidByWhenFindElements(self):
             pass #This is expected
 
     def _pageURL(self, name):
-        return "http://localhost:%d/%s.html" % (self.webserver.port, name)
- 
+        return self.webserver.where_is(name + '.html')
+
     def _loadSimplePage(self):
         self._loadPage("simpleTest")
 

py/test/selenium/webdriver/common/clear_tests.py

@@ -82,8 +82,8 @@ def testContentEditableAreaShouldClear(self):
         self.assertEqual("", element.text)
 
     def _pageURL(self, name):
-        return "http://localhost:%d/%s.html" % (self.webserver.port, name)
- 
+        return self.webserver.where_is(name + '.html')
+
     def _loadSimplePage(self):
         self._loadPage("simpleTest")
 

py/test/selenium/webdriver/common/click_scrolling_tests.py

@@ -73,4 +73,4 @@ def _loadPage(self, name):
         self.driver.get(self._pageURL(name))
 
     def _pageURL(self, name):
-        return "http://localhost:%d/%s.html" % (self.webserver.port, name)
+        return self.webserver.where_is(name + '.html')

py/test/selenium/webdriver/common/click_tests.py

@@ -22,4 +22,4 @@ def _loadPage(self, name):
         self.driver.get(self._pageURL(name))
 
     def _pageURL(self, name):
-        return "http://localhost:%d/%s.html" % (self.webserver.port, name)
+        return self.webserver.where_is(name + '.html')

py/test/selenium/webdriver/common/connection_tests.py

@@ -26,7 +26,7 @@ def testWeCanSeeTheBrowserIsOnline(self):
         self.assertTrue(self.driver.is_online())
 
     def _pageURL(self, name):
-        return "http://localhost:%d/%s.html" % (self.webserver.port, name)
+        return self.webserver.where_is(name + '.html')
 
     def _loadSimplePage(self):
         self._loadPage("simpleTest")

py/test/selenium/webdriver/common/cookie_tests.py

@@ -92,4 +92,4 @@ def _loadPage(self, name):
         self.driver.get(self._pageURL(name))
 
     def _pageURL(self, name):
-        return "http://localhost:%d/%s.html" % (self.webserver.port, name)
+        return self.webserver.where_is(name + '.html')