Bug 1128099 - Move TransferMixin from GaiaMixin to luciddream script
--- a/mozharness/mozilla/gaia.py
+++ b/mozharness/mozilla/gaia.py
@@ -3,17 +3,16 @@ Module for performing gaia-specific task
"""
import json
import os
import re
from mozharness.base.errors import HgErrorList, BaseErrorList, ZipErrorList
from mozharness.base.log import ERROR, FATAL
-from mozharness.base.transfer import TransferMixin
gaia_config_options = [
[["--gaia-dir"],
{"action": "store",
"dest": "gaia_dir",
"help": "directory where gaia repo should be cloned"
}],
[["--gaia-repo"],
@@ -24,17 +23,17 @@ gaia_config_options = [
[["--gaia-branch"],
{"action": "store",
"dest": "gaia_branch",
"default": "default",
"help": "branch of gaia repo to clone"
}],
]
-class GaiaMixin(TransferMixin):
+class GaiaMixin(object):
npm_error_list = BaseErrorList + [
{'substr': r'''npm ERR! Error:''', 'level': ERROR}
]
# This requires self to inherit a VCSMixin.
def clone_gaia(self, dest, repo, use_gaia_json=False):
"""
--- a/scripts/luciddream_unittest.py
+++ b/scripts/luciddream_unittest.py
@@ -14,26 +14,27 @@ import sys
sys.path.insert(1, os.path.dirname(sys.path[0]))
from mozharness.base.errors import BaseErrorList, TarErrorList, ZipErrorList
from mozharness.base.log import ERROR, WARNING, FATAL
from mozharness.base.script import (
BaseScript,
PreScriptAction,
)
+from mozharness.base.transfer import TransferMixin
from mozharness.base.vcs.vcsbase import MercurialScript
from mozharness.mozilla.blob_upload import BlobUploadMixin, blobupload_config_options
from mozharness.mozilla.testing.testbase import TestingMixin, testing_config_options
from mozharness.mozilla.mozbase import MozbaseMixin
from mozharness.mozilla.buildbot import TBPL_SUCCESS
from mozharness.mozilla.structuredlog import StructuredOutputParser
from mozharness.mozilla.gaia import GaiaMixin
class LuciddreamTest(TestingMixin, MercurialScript, MozbaseMixin, BaseScript,
- BlobUploadMixin, GaiaMixin):
+ BlobUploadMixin, TransferMixin, GaiaMixin):
config_options = [[
["--emulator-url"],
{"action": "store",
"dest": "emulator_url",
"default": None,
"help": "URL to the emulator zip",
}
], [