Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

merge default -> production-0.8

$ hg merge -P -r default
changeset:   3116:6b0db4a6de79
parent:      3114:656c69707be7
user:        Chris AtLee <catlee@mozilla.com>
date:        Tue Apr 23 08:32:20 2013 -0400
summary:     Bug 791335: Set lower timeouts for alive tests / check tests. r=bhearsum, philor

changeset:   3117:de40037f81cc
tag:         tip
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Tue Apr 23 12:41:28 2013 -0400
summary:     Bug 770578. Add win7-ix. r=coop

--HG--
branch : production-0.8
  • Loading branch information...
commit 552c9b9422bf34380b39eccb014e3ecfb06ef9f2 2 parents 774e263 + 4db0221
Justin Wood (Callek) authored
2  process/factory.py
@@ -5839,7 +5839,7 @@ def addUnpackBuildSteps(self):
5839 5839
                          property_name="exepath",
5840 5840
                          name="Find executable",
5841 5841
                          ))
5842  
-        elif self.OS in ('xp', 'win7', 'w764', 'win8'):
  5842
+        elif self.OS in ('xp', 'win7', 'w764', 'win8', 'win7-ix', 'xp-ix'):
5843 5843
             self.addStep(SetBuildProperty(
5844 5844
                          property_name="exepath",
5845 5845
                          value="../%s/%s" % (
28  steps/test.py
@@ -25,22 +25,13 @@
25 25
 #   Alice Nodelman <anodelman@mozilla.com>
26 26
 # ***** END LICENSE BLOCK *****
27 27
 
28  
-from buildbot.status.builder import FAILURE, SUCCESS, WARNINGS, EXCEPTION, \
  28
+from buildbot.status.builder import FAILURE, SUCCESS, EXCEPTION, \
29 29
     worst_status
30 30
 from buildbot.process.properties import WithProperties
31 31
 
32  
-from twisted.internet.defer import DeferredList, Deferred
33 32
 from twisted.python import log
34  
-from twisted.web.client import getPage
35  
-from twisted.internet import reactor
36 33
 
37  
-from urllib import urlencode
38  
-from time import strptime, strftime, localtime, mktime
39 34
 import re
40  
-import os
41  
-import signal
42  
-from os import path
43  
-import string
44 35
 
45 36
 from buildbotcustom.steps.base import ShellCommand
46 37
 
@@ -52,9 +43,9 @@ class AliveTest(ShellCommand):
52 43
     flunkOnFailure = False
53 44
     warnOnFailure = True
54 45
 
55  
-    def __init__(self, extraArgs=None, logfile=None, **kwargs):
  46
+    def __init__(self, extraArgs=None, logfile=None, timeout=300, maxTime=600, **kwargs):
56 47
         self.super_class = ShellCommand
57  
-        self.super_class.__init__(self, **kwargs)
  48
+        self.super_class.__init__(self, timeout=timeout, maxTime=maxTime, **kwargs)
58 49
 
59 50
         self.addFactoryArguments(extraArgs=extraArgs,
60 51
                                  logfile=logfile)
@@ -69,6 +60,7 @@ def __init__(self, extraArgs=None, logfile=None, **kwargs):
69 60
             self.command.append('--')
70 61
             self.command.extend(extraArgs)
71 62
 
  63
+
72 64
 class AliveMakeTest(ShellCommand):
73 65
     name = "alive test"
74 66
     description = ["alive test"]
@@ -76,9 +68,9 @@ class AliveMakeTest(ShellCommand):
76 68
     flunkOnFailure = False
77 69
     warnOnFailure = True
78 70
 
79  
-    def __init__(self, extraArgs=None, logfile=None, **kwargs):
  71
+    def __init__(self, extraArgs=None, logfile=None, timeout=300, maxTime=600, **kwargs):
80 72
         self.super_class = ShellCommand
81  
-        self.super_class.__init__(self, **kwargs)
  73
+        self.super_class.__init__(self, timeout=timeout, maxTime=maxTime, **kwargs)
82 74
 
83 75
         self.addFactoryArguments(extraArgs=extraArgs,
84 76
                                  logfile=logfile)
@@ -93,9 +85,11 @@ def __init__(self, extraArgs=None, logfile=None, **kwargs):
93 85
         if logfile:
94 86
             leakargs.append('-l')
95 87
             leakargs.append(logfile)
96  
-        self.command = ['bash', '-c',
97  
-            WithProperties("LEAKTEST_ARGS='" + ' '.join(leakargs) + \
98  
-                          "' python %(basedir)s/build/build/pymake/make.py leaktest")]
  88
+        self.command = [
  89
+            'bash', '-c',
  90
+            WithProperties("LEAKTEST_ARGS='" + ' '.join(leakargs) +
  91
+                           "' python %(basedir)s/build/build/pymake/make.py leaktest")]
  92
+
99 93
 
100 94
 def formatBytes(bytes, sigDigits=3):
101 95
     # Force a float calculation
4  steps/unittest.py
@@ -411,9 +411,9 @@ class ShellCommandReportTimeout(ShellCommand):
411 411
     """We subclass ShellCommand so that we can bubble up the timeout errors
412 412
     to tinderbox that normally only get appended to the buildbot slave logs.
413 413
     """
414  
-    def __init__(self, **kwargs):
  414
+    def __init__(self, timeout=2 * 3600, maxTime=4 * 3600, **kwargs):
415 415
         self.my_shellcommand = ShellCommand
416  
-        ShellCommand.__init__(self, **kwargs)
  416
+        ShellCommand.__init__(self, timeout=timeout, maxTime=maxTime, **kwargs)
417 417
 
418 418
     def evaluateCommand(self, cmd):
419 419
         superResult = self.my_shellcommand.evaluateCommand(self, cmd)

0 notes on commit 552c9b9

Please sign in to comment.
Something went wrong with that request. Please try again.