← Back to branch summary

~jbicha/firefox/update-dependencies

« back to all changes in this revision

Viewing changes to debian/patches/test-integration/automation-output-junit-xml.patch

  • Committer: Chris Coulson
  • Date: 2013-12-12 18:08:55 UTC
  • Revision ID: chris.coulson@canonical.com-20131212180855-hwy4z4x4bbg4tc2m
* New upstream release from the beta channel (FIREFOX_27b1_BUILD1)
* Refresh patches
  - update debian/patches/allow-lockPref-everywhere.patch
  - update debian/patches/ubuntu-ua-string-changes.patch
  - update d/p/test-integration/automation-output-junit-xml.patch
  - update d/p/test-integration/xpcshell-disable-tests-which-need-appdir-write-access.patch
  - update debian/patches/unity-menubar.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/test-integration/automation-output-junit-xml.patch
3
3
Author: Chris Coulson <chris.coulson@canonical.com>
4
4
Forwarded: no
5
5
 
6
 
Index: firefox-trunk-26.0~a1~hg20130823r143964/build/automation.py.in
 
6
Index: firefox-trunk-27.0~a1~hg20131021r151486/build/automation.py.in
7
7
===================================================================
8
 
--- firefox-trunk-26.0~a1~hg20130823r143964.orig/build/automation.py.in 2013-08-23 08:03:19.725879173 +0100
9
 
+++ firefox-trunk-26.0~a1~hg20130823r143964/build/automation.py.in      2013-08-23 08:03:19.717879173 +0100
 
8
--- firefox-trunk-27.0~a1~hg20131021r151486.orig/build/automation.py.in 2013-10-21 20:28:40.860893247 +0100
 
9
+++ firefox-trunk-27.0~a1~hg20131021r151486/build/automation.py.in      2013-10-21 20:28:40.852893247 +0100
10
10
@@ -20,6 +20,8 @@
11
11
 import sqlite3
12
12
 from datetime import datetime, timedelta
216
216
   def fillCertificateDB(self, profileDir, certPath, utilityPath, xrePath):
217
217
     pwfilePath = os.path.join(profileDir, ".crtdbpw")
218
218
     pwfile = open(pwfilePath, "w")
219
 
@@ -819,11 +1007,61 @@
 
219
@@ -843,11 +1031,61 @@
220
220
   def checkForCrashes(self, minidumpDir, symbolsPath):
221
221
     return mozcrash.check_for_crashes(minidumpDir, symbolsPath, test_name=self.lastTestSeen)
222
222
 
279
279
     """
280
280
     Run the app, log the duration it took to execute, return the status code.
281
281
     Kills the app if it runs for longer than |maxTime| seconds, or outputs nothing for |timeout| seconds.
282
 
@@ -838,6 +1076,11 @@
 
282
@@ -862,6 +1100,11 @@
283
283
     if timeout == -1:
284
284
       timeout = self.DEFAULT_TIMEOUT
285
285
 
291
291
     # copy env so we don't munge the caller's environment
292
292
     env = dict(env);
293
293
     env["NO_EM_RESTART"] = "1"
294
 
@@ -885,9 +1128,17 @@
 
294
@@ -909,9 +1152,17 @@
295
295
       # app is launched.
296
296
       onLaunch()
297
297
 
309
309
     # Do a final check for zombie child processes.
310
310
     zombieProcesses = self.checkForZombies(processLog, utilityPath, debuggerInfo)
311
311
 
312
 
Index: firefox-trunk-26.0~a1~hg20130823r143964/layout/tools/reftest/reftest.js
 
312
Index: firefox-trunk-27.0~a1~hg20131021r151486/layout/tools/reftest/reftest.js
313
313
===================================================================
314
 
--- firefox-trunk-26.0~a1~hg20130823r143964.orig/layout/tools/reftest/reftest.js        2013-08-23 08:03:19.725879173 +0100
315
 
+++ firefox-trunk-26.0~a1~hg20130823r143964/layout/tools/reftest/reftest.js     2013-08-23 08:03:19.717879173 +0100
316
 
@@ -1127,17 +1127,17 @@
 
314
--- firefox-trunk-27.0~a1~hg20131021r151486.orig/layout/tools/reftest/reftest.js        2013-10-21 20:28:40.860893247 +0100
 
315
+++ firefox-trunk-27.0~a1~hg20131021r151486/layout/tools/reftest/reftest.js     2013-10-21 20:28:40.852893247 +0100
 
316
@@ -1163,17 +1163,17 @@
317
317
         var test = gURLs[0];
318
318
         if (test.expected == EXPECTED_DEATH) {
319
319
             ++gTestResults.Skip;
334
334
             gURLs.shift();
335
335
         } else {
336
336
             break;
337
 
@@ -1216,11 +1216,11 @@
 
337
@@ -1252,11 +1252,11 @@
338
338
             if (e == "bad pref") {
339
339
                 var test = gURLs[0];
340
340
                 if (test.expected == EXPECTED_FAIL) {
348
348
                              " | " + badPref + " not known or wrong type\n");
349
349
                     ++gTestResults.UnexpectedFail;
350
350
                 }
351
 
Index: firefox-trunk-26.0~a1~hg20130823r143964/layout/tools/reftest/runreftest.py
 
351
Index: firefox-trunk-27.0~a1~hg20131021r151486/layout/tools/reftest/runreftest.py
352
352
===================================================================
353
 
--- firefox-trunk-26.0~a1~hg20130823r143964.orig/layout/tools/reftest/runreftest.py     2013-08-23 08:03:19.725879173 +0100
354
 
+++ firefox-trunk-26.0~a1~hg20130823r143964/layout/tools/reftest/runreftest.py  2013-08-23 08:04:48.081879272 +0100
 
353
--- firefox-trunk-27.0~a1~hg20131021r151486.orig/layout/tools/reftest/runreftest.py     2013-10-21 20:28:40.860893247 +0100
 
354
+++ firefox-trunk-27.0~a1~hg20131021r151486/layout/tools/reftest/runreftest.py  2013-10-21 20:28:40.852893247 +0100
355
355
@@ -137,6 +137,15 @@
356
356
       reftestlist = self.getManifestPath(testPath)
357
357
       if cmdlineArgs == None:
392
392
     self.set_defaults(**defaults)
393
393
 
394
394
   def verifyCommonOptions(self, options, reftest):
395
 
Index: firefox-trunk-26.0~a1~hg20130823r143964/testing/mochitest/runtests.py
 
395
Index: firefox-trunk-27.0~a1~hg20131021r151486/testing/mochitest/runtests.py
396
396
===================================================================
397
 
--- firefox-trunk-26.0~a1~hg20130823r143964.orig/testing/mochitest/runtests.py  2013-08-23 08:03:19.725879173 +0100
398
 
+++ firefox-trunk-26.0~a1~hg20130823r143964/testing/mochitest/runtests.py       2013-08-23 08:03:19.721879173 +0100
399
 
@@ -545,6 +545,28 @@
400
 
                     "VMware recording: (%s)" % str(e))
401
 
       self.vmwareHelper = None
 
397
--- firefox-trunk-27.0~a1~hg20131021r151486.orig/testing/mochitest/runtests.py  2013-10-21 20:28:40.860893247 +0100
 
398
+++ firefox-trunk-27.0~a1~hg20131021r151486/testing/mochitest/runtests.py       2013-10-21 20:30:29.684894109 +0100
 
399
@@ -924,6 +924,28 @@
 
400
 
 
401
     return status
402
402
 
403
403
+  def getXunitParams(self, options):
404
404
+    if options.a11y:
424
424
+
425
425
   def runTests(self, options, onLaunch=None):
426
426
     """ Prepare, configure, run tests and cleanup """
427
 
     debuggerInfo = getDebuggerInfo(self.oldcwd, options.debugger, options.debuggerArgs,
428
 
@@ -592,6 +614,8 @@
 
427
 
 
428
@@ -989,6 +1011,8 @@
429
429
     if options.vmwareRecording:
430
430
       self.startVMwareRecording(options);
431
431
 
433
433
+
434
434
     log.info("runtests.py | Running tests: start.\n")
435
435
     try:
436
 
       status = self.automation.runApp(testURL, browserEnv, options.app,
437
 
@@ -603,7 +627,10 @@
438
 
                                   debuggerInfo=debuggerInfo,
439
 
                                   symbolsPath=options.symbolsPath,
440
 
                                   timeout=timeout,
441
 
-                                  onLaunch=onLaunch)
442
 
+                                  onLaunch=onLaunch,
443
 
+                                  xunitFile=options.xunitFile,
444
 
+                                  xunitName=xunitName,
445
 
+                                  xunitRoot=xunitRoot)
 
436
       status = self.runApp(testURL,
 
437
@@ -1002,7 +1026,10 @@
 
438
                            debuggerInfo=debuggerInfo,
 
439
                            symbolsPath=options.symbolsPath,
 
440
                            timeout=timeout,
 
441
-                           onLaunch=onLaunch
 
442
+                           onLaunch=onLaunch,
 
443
+                           xunitFile=options.xunitFile,
 
444
+                           xunitName=xunitName,
 
445
+                           xunitRoot=xunitRoot
 
446
                            )
446
447
     except KeyboardInterrupt:
447
448
       log.info("runtests.py | Received keyboard interrupt.\n");
448
 
       status = -1