Changes to wrapper removal

.hg/cache/tags

@@ -1,2 +1,2 @@
-111 9aad9c039a2cec7bce3313dc56044e9769f88f78
+112 a4e10c86684848e6210454fe0c82fe9279361f08
 

.hg/undo.desc

@@ -1,3 +1,2 @@
-0
-pull
-http://hg.mozilla.org/qa/mozmill-automation/
+112
+commit

libs/scraper.py

@@ -18,7 +18,7 @@
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
-# Henrik Skupin <hskupin@mozilla.com>
+#   Henrik Skupin <hskupin@mozilla.com>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -48,7 +48,7 @@
 
 
 # Base URL for the path to all builds
-BASE_URL = 'http://stage.mozilla.org/pub/mozilla.org'
+BASE_URL = 'https://ftp.mozilla.org/pub/mozilla.org'
 
 PLATFORM_FRAGMENTS = {'linux': 'linux-i686',
                       'linux64': 'linux-x86_64',
@@ -459,7 +459,7 @@ def get_build_info_for_version(self, version, build_index=None):
     @property
     def candidate_build_list_regex(self):
         """Return the regex for the folder which contains the builds of
-a candidate build."""
+           a candidate build."""
 
         # Regex for possible builds for the given date
         return r'nightly/%(VERSION)s-candidates/' % {
@@ -512,11 +512,11 @@ def download(self):
 class TinderboxScraper(MozillaScraper):
     """Class to download a tinderbox build from the Mozilla server.
 
-There are two ways to specify a unique build:
-1. If the date (%Y-%m-%d) is given and build_number is given where
-the build_number is the index of the build on the date
-2. If the build timestamp (UNIX) is given, and matches a specific build.
-"""
+    There are two ways to specify a unique build:
+    1. If the date (%Y-%m-%d) is given and build_number is given where
+       the build_number is the index of the build on the date
+    2. If the build timestamp (UNIX) is given, and matches a specific build.
+    """
 
     def __init__(self, branch='mozilla-central', build_number=None, date=None,
                  debug_build=False, *args, **kwargs):
@@ -682,8 +682,8 @@ def platform_regex(self):
 
 class PacificTimezone(tzinfo):
     """Class to set the timezone to PST/PDT and automatically adjusts
-for daylight saving.
-"""
+    for daylight saving.
+    """
 
     def utcoffset(self, dt):
         return timedelta(hours=-8) + self.dst(dt)
@@ -710,4 +710,4 @@ def first_sunday(self, year, month):
         date = datetime(year, month, 1, 0)
         days_until_sunday = 6 - date.weekday()
 
-        return date + timedelta(days=days_until_sunday)
+        return date + timedelta(days=days_until_sunday)

libs/testrun.py

@@ -18,9 +18,9 @@
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
-# Henrik Skupin <hskupin@mozilla.com>
-# Dave Hunt <dhunt@mozilla.com>
-# Aaron Train <atrain@mozilla.com>
+#   Henrik Skupin <hskupin@mozilla.com>
+#   Dave Hunt <dhunt@mozilla.com>
+#   Aaron Train <atrain@mozilla.com>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -160,8 +160,7 @@ def __init__(self, args=sys.argv[1:], debug=False, repository_path=None,
     def _generate_custom_report(self):
         if self.options.junit_file:
             filename = self._get_unique_filename(self.options.junit_file)
-            custom_report = self.update_report(self._mozmill.mozmill.get_report())
-            report.JUnitReport(custom_report, filename)
+            report.JUnitReport(self._mozmill.mozmill.get_report(), filename)
 
     def _get_binaries(self):
         """ Returns the list of binaries to test. """
@@ -730,11 +729,11 @@ def run_tests(self):
 
         # Don't execute non-restart tests until we have tests available
         #try:
-        # self.restart_tests = False
-        # self.test_path = os.path.join('tests', 'remote')
-        # TestRun.run_tests(self)
+        #    self.restart_tests = False
+        #    self.test_path = os.path.join('tests', 'remote')
+        #    TestRun.run_tests(self)
         #except Exception, e:
-        # print str(e)
+        #    print str(e)
 
         try:
             self.restart_tests = True
@@ -777,7 +776,7 @@ def __init__(self, *args, **kwargs):
 
     def build_wiki_entry(self, result):
         """ Until we show results on the dashboard create a wiki like output
-format for data from the first and last update performed """
+            format for data from the first and last update performed """
 
         first_update = result["updates"][0]
         last_update = result["updates"][-1]
@@ -916,4 +915,4 @@ def update_report(self, report):
       TestRun.update_report(self, report)
       report['updates'] = self._mozmill.mozmill.persisted['updates']
 
-      return report
+      return report