Merge Bug 1230279
authorMaja Frydrychowicz <mjzffr@gmail.com>
Thu, 31 Dec 2015 16:55:34 -0500
changeset 326874 c99e694c585cc015dbd3e500b9080baaa41b5d37
parent 326873 98709e18117859b5ecb6c66eb18d6456cae4a8df (current diff)
parent 318197 5502a1635104776fcd979b4348784f8f92256d59 (diff)
child 326875 029382898fae9edc92634dff557e734ae020a6b3
push id10169
push userdminor@mozilla.com
push dateThu, 28 Jan 2016 13:10:48 +0000
bugs1230279
milestone46.0a1
Merge Bug 1230279
testing/mozharness/configs/mediatests/buildbot_posix_config.py
testing/mozharness/configs/mediatests/buildbot_windows_config.py
testing/mozharness/mozharness/mozilla/testing/firefox_media_tests.py
testing/mozharness/scripts/firefox_media_tests_buildbot.py
--- a/testing/mozharness/scripts/firefox_media_tests_buildbot.py
+++ b/testing/mozharness/scripts/firefox_media_tests_buildbot.py
@@ -27,17 +27,19 @@ from mozharness.mozilla.buildbot import 
 from mozharness.mozilla.testing.firefox_media_tests import (
     FirefoxMediaTestsBase, BUSTED, TESTFAILED, UNKNOWN, EXCEPTION, SUCCESS
 )
 
 
 class FirefoxMediaTestsBuildbot(FirefoxMediaTestsBase, BlobUploadMixin):
 
     def __init__(self):
+        config_options = copy.deepcopy(blobupload_config_options)
         super(FirefoxMediaTestsBuildbot, self).__init__(
+            config_options=config_options,
             all_actions=['clobber',
                          'read-buildbot-config',
                          'checkout',
                          'download-and-extract',
                          'create-virtualenv',
                          'install',
                          'run-media-tests',
                          ],