Commits

Andrew Halberstadt  committed c4735ed

Bug 855893 - Use in tree mozbase for unittests, r=aki

  • Participants
  • Parent commits 4c7cd2e

Comments (0)

Files changed (2)

File scripts/b2g_emulator_unittest.py

         {'regex': re.compile(r'''(Timeout|NoSuchAttribute|Javascript|NoSuchElement|XPathLookup|NoSuchWindow|StaleElement|ScriptTimeout|ElementNotVisible|NoSuchFrame|InvalidElementState|NoAlertPresent|InvalidCookieDomain|UnableToSetCookie|InvalidSelector|MoveTargetOutOfBounds)Exception'''), 'level': ERROR},
     ]
 
-    virtualenv_requirements = [
-        os.path.join('tests', 'b2g', 'b2g-unittest-requirements.txt')
-    ]
-
+    mozbase_dir = os.path.join('tests', 'mozbase')
     virtualenv_modules = [
-        'mozinstall',
-        {'marionette': os.path.join('tests', 'marionette')}
+        { 'manifestparser': os.path.join(mozbase_dir, 'manifestdestiny') },
+        { 'mozfile': os.path.join(mozbase_dir, 'mozfile') },
+        { 'mozhttpd': os.path.join(mozbase_dir, 'mozhttpd') },
+        { 'mozinfo': os.path.join(mozbase_dir, 'mozinfo') },
+        { 'mozinstall': os.path.join(mozbase_dir, 'mozinstall') },
+        { 'mozprofile': os.path.join(mozbase_dir, 'mozprofile') },
+        { 'mozprocess': os.path.join(mozbase_dir, 'mozprocess') },
+        { 'mozrunner': os.path.join(mozbase_dir, 'mozrunner') },
+        { 'mozdevice': os.path.join(mozbase_dir, 'mozdevice') },
+        { 'marionette': os.path.join('tests', 'marionette') },
     ]
 
     def __init__(self, require_config_file=False):
             require_config_file=require_config_file,
             config={
                 'virtualenv_modules': self.virtualenv_modules,
-                'virtualenv_requirements': self.virtualenv_requirements,
                 'require_test_zip': True,
                 'emulator': 'arm',
                 # This is a special IP that has meaning to the emulator

File scripts/marionette.py

         {'regex': re.compile(r'''(Timeout|NoSuchAttribute|Javascript|NoSuchElement|XPathLookup|NoSuchWindow|StaleElement|ScriptTimeout|ElementNotVisible|NoSuchFrame|InvalidElementState|NoAlertPresent|InvalidCookieDomain|UnableToSetCookie|InvalidSelector|MoveTargetOutOfBounds)Exception'''), 'level': ERROR},
     ]
 
+    mozbase_dir = os.path.join('tests', 'mozbase')
     virtualenv_modules = [
-        'mozinstall',
-        {'marionette': os.path.join('tests', 'marionette')}
+        { 'manifestparser': os.path.join(mozbase_dir, 'manifestdestiny') },
+        { 'mozhttpd': os.path.join(mozbase_dir, 'mozhttpd') },
+        { 'mozinfo': os.path.join(mozbase_dir, 'mozinfo') },
+        { 'mozfile': os.path.join(mozbase_dir, 'mozfile') },
+        { 'mozinstall': os.path.join(mozbase_dir, 'mozinstall') },
+        { 'mozprofile': os.path.join(mozbase_dir, 'mozprofile') },
+        { 'mozprocess': os.path.join(mozbase_dir, 'mozprocess') },
+        { 'mozrunner': os.path.join(mozbase_dir, 'mozrunner') },
+        { 'mozdevice': os.path.join(mozbase_dir, 'mozdevice') },
     ]
 
     repos = []