Skip to content
This repository has been archived by the owner on Sep 15, 2021. It is now read-only.

Commit

Permalink
Bug 827531 - Install mozbase packages from puppetagain, r=aki
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonathan Griffin committed Jan 9, 2013
1 parent 81b86a2 commit ae84e6a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 30 deletions.
13 changes: 2 additions & 11 deletions scripts/b2g_emulator_unittest.py
View file
Expand Up @@ -109,18 +109,9 @@ class B2GEmulatorTest(TestingMixin, TooltoolMixin, EmulatorMixin, BaseScript):
{'regex': re.compile(r'''(Timeout|NoSuchAttribute|Javascript|NoSuchElement|XPathLookup|NoSuchWindow|StaleElement|ScriptTimeout|ElementNotVisible|NoSuchFrame|InvalidElementState|NoAlertPresent|InvalidCookieDomain|UnableToSetCookie|InvalidSelector|MoveTargetOutOfBounds)Exception'''), 'level': ERROR}, {'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 = [ virtualenv_modules = [
{ 'manifestparser': os.path.join(mozbase_dir, 'manifestdestiny') }, 'mozinstall',
{ 'mozfile': os.path.join(mozbase_dir, 'mozfile') }, {'marionette': os.path.join('tests', 'marionette')}
{ '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): def __init__(self, require_config_file=False):
Expand Down
10 changes: 1 addition & 9 deletions scripts/b2g_panda.py
View file
Expand Up @@ -50,15 +50,7 @@ class PandaTest(TestingMixin, BaseScript, VirtualenvMixin, MozpoolMixin, Buildbo
mozbase_dir = os.path.join('tests', 'mozbase') mozbase_dir = os.path.join('tests', 'mozbase')
virtualenv_modules = [ virtualenv_modules = [
'requests', 'requests',
{ 'manifestparser': os.path.join(mozbase_dir, 'manifestdestiny') }, 'mozinstall',
{ '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') },
{ 'marionette': os.path.join('tests', 'marionette/client') }, { 'marionette': os.path.join('tests', 'marionette/client') },
{ 'gaiatest': os.path.join('tests', 'gaiatest') }, { 'gaiatest': os.path.join('tests', 'gaiatest') },
] ]
Expand Down
12 changes: 2 additions & 10 deletions scripts/marionette.py
View file
Expand Up @@ -77,17 +77,9 @@ class MarionetteTest(TestingMixin, TooltoolMixin, EmulatorMixin, BaseScript):
{'regex': re.compile(r'''(Timeout|NoSuchAttribute|Javascript|NoSuchElement|XPathLookup|NoSuchWindow|StaleElement|ScriptTimeout|ElementNotVisible|NoSuchFrame|InvalidElementState|NoAlertPresent|InvalidCookieDomain|UnableToSetCookie|InvalidSelector|MoveTargetOutOfBounds)Exception'''), 'level': ERROR}, {'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 = [ virtualenv_modules = [
{ 'manifestparser': os.path.join(mozbase_dir, 'manifestdestiny') }, 'mozinstall',
{ 'mozhttpd': os.path.join(mozbase_dir, 'mozhttpd') }, {'marionette': os.path.join('tests', 'marionette')}
{ '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') },
] ]


def __init__(self, require_config_file=False): def __init__(self, require_config_file=False):
Expand Down

0 comments on commit ae84e6a

Please sign in to comment.