Bug 897967 - FirefoxRunner et al should subclass LocalRunner instead …

…of Runner, r=jgriffin

mozrunner/mozrunner/local.py

@@ -7,7 +7,7 @@
 __all__ = ['CLI',
            'cli',
            'package_metadata',
-           'Runner',
+           'LocalRunner',
            'local_runners',
            'FirefoxRunner',
            'MetroFirefoxRunner',
@@ -202,20 +202,20 @@ def _wrap_command(self, cmd):
         return cmd
 
 
-class FirefoxRunner(Runner):
-    """Specialized Runner subclass for running Firefox."""
+class FirefoxRunner(LocalRunner):
+    """Specialized LocalRunner subclass for running Firefox."""
 
     profile_class = FirefoxProfile
 
     def __init__(self, profile, binary=None, **kwargs):
 
         # take the binary from BROWSER_PATH environment variable
         binary = binary or os.environ.get('BROWSER_PATH')
-        Runner.__init__(self, profile, binary, **kwargs)
+        LocalRunner.__init__(self, profile, binary, **kwargs)
 
 
-class MetroFirefoxRunner(Runner):
-    """Specialized Runner subclass for running Firefox.Metro"""
+class MetroFirefoxRunner(LocalRunner):
+    """Specialized LocalRunner subclass for running Firefox.Metro"""
 
     profile_class = MetroFirefoxProfile
 
@@ -229,7 +229,7 @@ def __init__(self, profile, binary=None, **kwargs):
 
         # take the binary from BROWSER_PATH environment variable
         binary = binary or os.environ.get('BROWSER_PATH')
-        Runner.__init__(self, profile, binary, **kwargs)
+        LocalRunner.__init__(self, profile, binary, **kwargs)
 
         if not os.path.exists(self.immersiveHelperPath):
             raise OSError('Can not find Metro launcher: %s' % self.immersiveHelperPath)
@@ -239,14 +239,14 @@ def __init__(self, profile, binary=None, **kwargs):
 
     @property
     def command(self):
-       command = Runner.command.fget(self)
+       command = LocalRunner.command.fget(self)
        command[:0] = [self.immersiveHelperPath, '-firefoxpath']
 
        return command
 
 
-class ThunderbirdRunner(Runner):
-    """Specialized Runner subclass for running Thunderbird"""
+class ThunderbirdRunner(LocalRunner):
+    """Specialized LocalRunner subclass for running Thunderbird"""
     profile_class = ThunderbirdProfile
 
 local_runners = {'firefox': FirefoxRunner,

mozrunner/setup.py

@@ -6,7 +6,7 @@
 from setuptools import setup
 
 PACKAGE_NAME = "mozrunner"
-PACKAGE_VERSION = '5.21'
+PACKAGE_VERSION = '5.22'
 
 desc = """Reliable start/stop/configuration of Mozilla Applications (Firefox, Thunderbird, etc.)"""