Bug 827493 - Make Marionette use moznetwork, r=jhammel
authorAnhad Jai Singh <ffledgling@gmail.com>
Thu, 14 Feb 2013 13:42:26 -0800
changeset 121989 33247c135813086c49e88306c93bb330e4250a7a
parent 121988 ec601ae4a64d18a723bddb1399d2e71d040282b0
child 121990 a871b38f17166095c361e224a7139a63904b9f4c
push id24314
push userryanvm@gmail.com
push dateFri, 15 Feb 2013 14:39:46 +0000
treeherdermozilla-central@326c5e4868fe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjhammel
bugs827493
milestone21.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 827493 - Make Marionette use moznetwork, r=jhammel
testing/marionette/client/marionette/runtests.py
testing/marionette/client/setup.py
--- a/testing/marionette/client/marionette/runtests.py
+++ b/testing/marionette/client/marionette/runtests.py
@@ -8,20 +8,21 @@ import inspect
 import logging
 from optparse import OptionParser
 import os
 import unittest
 import socket
 import sys
 import time
 import platform
+import moznetwork
 import xml.dom.minidom as dom
 
 from manifestparser import TestManifest
-from mozhttpd import iface, MozHttpd
+from mozhttpd import MozHttpd
 
 from marionette import Marionette
 from marionette_test import MarionetteJSTestCase, MarionetteTestCase
 
 
 class MarionetteTestResult(unittest._TextTestResult):
 
     def __init__(self, *args, **kwargs):
@@ -245,17 +246,17 @@ class MarionetteTestRunner(object):
     def reset_test_stats(self):
         self.passed = 0
         self.failed = 0
         self.todo = 0
         self.failures = []
         self.perfrequest = None
 
     def start_httpd(self):
-        host = iface.get_lan_ip()
+        host = moznetwork.get_ip()
         s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         s.bind(("",0))
         port = s.getsockname()[1]
         s.close()
         self.baseurl = 'http://%s:%d/' % (host, port)
         self.logger.info('running webserver on %s' % self.baseurl)
         self.httpd = MozHttpd(host=host,
                               port=port,
--- a/testing/marionette/client/setup.py
+++ b/testing/marionette/client/setup.py
@@ -1,24 +1,24 @@
 import os
 from setuptools import setup, find_packages
 
-version = '0.5.18'
+version = '0.5.19'
 
 # get documentation from the README
 try:
     here = os.path.dirname(os.path.abspath(__file__))
     description = file(os.path.join(here, 'README.md')).read()
 except (OSError, IOError):
     description = ''
 
 # dependencies
 deps = ['manifestdestiny', 'mozhttpd >= 0.3',
         'mozprocess >= 0.6', 'mozrunner >= 5.11',
-        'mozdevice >= 0.12']
+        'mozdevice >= 0.12', 'moznetwork >= 0.21']
 
 setup(name='marionette_client',
       version=version,
       description="Marionette test automation client",
       long_description=description,
       classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
       keywords='mozilla',
       author='Jonathan Griffin',