Bug 879492 - Add a B2GBuild class to Marionette, r=aki

testing/marionette/client/marionette/b2gbuild.py

@@ -0,0 +1,98 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import os
+import platform
+import subprocess
+import sys
+
+
+class B2GBuild(object):
+
+    @classmethod
+    def find_b2g_dir(cls):
+        for env_var in ('B2G_DIR', 'B2G_HOME'):
+            if env_var in os.environ:
+                env_dir = os.environ[env_var]
+                env_dir = cls.check_b2g_dir(env_dir)
+                if env_dir:
+                    return env_dir
+
+        cwd = os.getcwd()
+        cwd = cls.check_b2g_dir(cwd)
+        if cwd:
+            return cwd
+
+        return None
+
+    @classmethod
+    def check_adb(cls, homedir):
+        if 'ADB' in os.environ:
+            env_adb = os.environ['ADB']
+            if os.path.exists(env_adb):
+                return env_adb
+
+        return cls.check_host_binary(homedir, 'adb')
+
+    @classmethod
+    def check_b2g_dir(cls, dir):
+        if os.path.isfile(os.path.join(dir, 'load-config.sh')):
+            return dir
+
+        oldstyle_dir = os.path.join(dir, 'glue', 'gonk-ics')
+        if os.access(oldstyle_dir, os.F_OK):
+            return oldstyle_dir
+
+        return None
+
+    @classmethod
+    def check_fastboot(cls, homedir):
+        return cls.check_host_binary(homedir, 'fastboot')
+
+    @classmethod
+    def check_host_binary(cls, homedir, binary):
+        host_dir = "linux-x86"
+        if platform.system() == "Darwin":
+            host_dir = "darwin-x86"
+        binary_path = subprocess.Popen(['which', binary],
+                                       stdout=subprocess.PIPE,
+                                       stderr=subprocess.STDOUT)
+        if binary_path.wait() == 0:
+            return binary_path.stdout.read().strip()  # remove trailing newline
+        binary_paths = [os.path.join(homedir, 'glue', 'gonk', 'out', 'host',
+                                     host_dir, 'bin', binary),
+                        os.path.join(homedir, 'out', 'host', host_dir,
+                                     'bin', binary),
+                        os.path.join(homedir, 'bin', binary)]
+        for option in binary_paths:
+            if os.path.exists(option):
+                return option
+        raise Exception('%s not found!' % binary)
+
+    def __init__(self, homedir=None, emulator=False):
+        if not homedir:
+            homedir = self.find_b2g_dir()
+        else:
+            homedir = self.check_b2g_dir(homedir)
+
+        if not homedir:
+            raise EnvironmentError('Must define B2G_HOME or pass the homedir parameter')
+
+        self.homedir = homedir
+        self.adb_path = self.check_adb(self.homedir)
+        self.update_tools = os.path.join(self.homedir, 'tools', 'update-tools')
+        self.fastboot_path = None if emulator else self.check_fastboot(self.homedir)
+
+    def import_update_tools(self):
+        """Import the update_tools package from B2G"""
+        sys.path.append(self.update_tools)
+        import update_tools
+        sys.path.pop()
+        return update_tools
+
+    def check_file(self, filePath):
+        if not os.access(filePath, os.F_OK):
+            raise Exception(('File not found: %s; did you pass the B2G home '
+                             'directory as the homedir parameter, or set '
+                             'B2G_HOME correctly?') % filePath)

testing/marionette/client/marionette/b2ginstance.py

@@ -3,92 +3,21 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from ConfigParser import ConfigParser
-import os
-import platform
 import posixpath
 import shutil
-import subprocess
-import sys
 import tempfile
 import traceback
 
+from b2gbuild import B2GBuild
 from mozdevice import DeviceManagerADB
 import mozcrash
 
-class B2GInstance(object):
-    @classmethod
-    def check_b2g_dir(cls, dir):
-        if os.path.isfile(os.path.join(dir, 'load-config.sh')):
-            return dir
 
-        oldstyle_dir = os.path.join(dir, 'glue', 'gonk-ics')
-        if os.access(oldstyle_dir, os.F_OK):
-            return oldstyle_dir
+class B2GInstance(B2GBuild):
 
-        return None
+    def __init__(self, devicemanager=None, **kwargs):
+        B2GBuild.__init__(self, **kwargs)
 
-    @classmethod
-    def find_b2g_dir(cls):
-        for env_var in ('B2G_DIR', 'B2G_HOME'):
-            if env_var in os.environ:
-                env_dir = os.environ[env_var]
-                env_dir = cls.check_b2g_dir(env_dir)
-                if env_dir:
-                    return env_dir
-
-        cwd = os.getcwd()
-        cwd = cls.check_b2g_dir(cwd)
-        if cwd:
-            return cwd
-
-        return None
-
-    @classmethod
-    def check_adb(cls, homedir):
-        if 'ADB' in os.environ:
-            env_adb = os.environ['ADB']
-            if os.path.exists(env_adb):
-                return env_adb
-
-        return cls.check_host_binary(homedir, 'adb')
-
-    @classmethod
-    def check_fastboot(cls, homedir):
-        return cls.check_host_binary(homedir, 'fastboot')
-
-    @classmethod
-    def check_host_binary(cls, homedir, binary):
-        host_dir = "linux-x86"
-        if platform.system() == "Darwin":
-            host_dir = "darwin-x86"
-        binary_path = subprocess.Popen(['which', binary],
-                                       stdout=subprocess.PIPE,
-                                       stderr=subprocess.STDOUT)
-        if binary_path.wait() == 0:
-            return binary_path.stdout.read().strip()  # remove trailing newline
-        binary_paths = [os.path.join(homedir, 'glue', 'gonk', 'out', 'host',
-                                     host_dir, 'bin', binary),
-                        os.path.join(homedir, 'out', 'host', host_dir,
-                                     'bin', binary),
-                        os.path.join(homedir, 'bin', binary)]
-        for option in binary_paths:
-            if os.path.exists(option):
-                return option
-        raise Exception('%s not found!' % binary)
-
-    def __init__(self, homedir=None, devicemanager=None, emulator=False):
-        if not homedir:
-            homedir = self.find_b2g_dir()
-        else:
-            homedir = self.check_b2g_dir(homedir)
-
-        if not homedir:
-            raise EnvironmentError('Must define B2G_HOME or pass the homedir parameter')
-
-        self.homedir = homedir
-        self.adb_path = self.check_adb(self.homedir)
-        self.fastboot_path = None if emulator else self.check_fastboot(self.homedir)
-        self.update_tools = os.path.join(self.homedir, 'tools', 'update-tools')
         self._dm = devicemanager
         self._remote_profiles = None
 
@@ -104,12 +33,6 @@ class B2GInstance(object):
             self.check_remote_profiles()
         return self._remote_profiles
 
-    def check_file(self, filePath):
-        if not os.access(filePath, os.F_OK):
-            raise Exception(('File not found: %s; did you pass the B2G home '
-                             'directory as the homedir parameter, or set '
-                             'B2G_HOME correctly?') % filePath)
-
     def check_remote_profiles(self, remote_profiles_ini='/data/b2g/mozilla/profiles.ini'):
         if not self.dm.fileExists(remote_profiles_ini):
             raise Exception("Remote file '%s' not found" % remote_profiles_ini)
@@ -144,10 +67,3 @@ class B2GInstance(object):
                 shutil.rmtree(local_dump_dir)
                 self.dm.removeDir(remote_dump_dir)
         return crashed
-
-    def import_update_tools(self):
-        """Import the update_tools package from B2G"""
-        sys.path.append(self.update_tools)
-        import update_tools
-        sys.path.pop()
-        return update_tools

testing/marionette/update-smoketests/smoketest.py

@@ -18,8 +18,8 @@ marionette_client_dir = os.path.join(marionette_dir, 'client', 'marionette')
 
 def find_b2g():
     sys.path.append(marionette_client_dir)
-    from b2ginstance import B2GInstance
-    return B2GInstance()
+    from b2gbuild import B2GBuild
+    return B2GBuild()
 
 class DictObject(dict):
     def __getattr__(self, item):