Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
@Callek Callek authored
Showing with 14 additions and 20 deletions.
  1. +1 −1  process/factory.py
  2. +11 −17 steps/test.py
  3. +2 −2 steps/unittest.py
View
2  process/factory.py
@@ -5839,7 +5839,7 @@ def addUnpackBuildSteps(self):
property_name="exepath",
name="Find executable",
))
- elif self.OS in ('xp', 'win7', 'w764', 'win8'):
+ elif self.OS in ('xp', 'win7', 'w764', 'win8', 'win7-ix', 'xp-ix'):
self.addStep(SetBuildProperty(
property_name="exepath",
value="../%s/%s" % (
View
28 steps/test.py
@@ -25,22 +25,13 @@
# Alice Nodelman <anodelman@mozilla.com>
# ***** END LICENSE BLOCK *****
-from buildbot.status.builder import FAILURE, SUCCESS, WARNINGS, EXCEPTION, \
+from buildbot.status.builder import FAILURE, SUCCESS, EXCEPTION, \
worst_status
from buildbot.process.properties import WithProperties
-from twisted.internet.defer import DeferredList, Deferred
from twisted.python import log
-from twisted.web.client import getPage
-from twisted.internet import reactor
-from urllib import urlencode
-from time import strptime, strftime, localtime, mktime
import re
-import os
-import signal
-from os import path
-import string
from buildbotcustom.steps.base import ShellCommand
@@ -52,9 +43,9 @@ class AliveTest(ShellCommand):
flunkOnFailure = False
warnOnFailure = True
- def __init__(self, extraArgs=None, logfile=None, **kwargs):
+ def __init__(self, extraArgs=None, logfile=None, timeout=300, maxTime=600, **kwargs):
self.super_class = ShellCommand
- self.super_class.__init__(self, **kwargs)
+ self.super_class.__init__(self, timeout=timeout, maxTime=maxTime, **kwargs)
self.addFactoryArguments(extraArgs=extraArgs,
logfile=logfile)
@@ -69,6 +60,7 @@ def __init__(self, extraArgs=None, logfile=None, **kwargs):
self.command.append('--')
self.command.extend(extraArgs)
+
class AliveMakeTest(ShellCommand):
name = "alive test"
description = ["alive test"]
@@ -76,9 +68,9 @@ class AliveMakeTest(ShellCommand):
flunkOnFailure = False
warnOnFailure = True
- def __init__(self, extraArgs=None, logfile=None, **kwargs):
+ def __init__(self, extraArgs=None, logfile=None, timeout=300, maxTime=600, **kwargs):
self.super_class = ShellCommand
- self.super_class.__init__(self, **kwargs)
+ self.super_class.__init__(self, timeout=timeout, maxTime=maxTime, **kwargs)
self.addFactoryArguments(extraArgs=extraArgs,
logfile=logfile)
@@ -93,9 +85,11 @@ def __init__(self, extraArgs=None, logfile=None, **kwargs):
if logfile:
leakargs.append('-l')
leakargs.append(logfile)
- self.command = ['bash', '-c',
- WithProperties("LEAKTEST_ARGS='" + ' '.join(leakargs) + \
- "' python %(basedir)s/build/build/pymake/make.py leaktest")]
+ self.command = [
+ 'bash', '-c',
+ WithProperties("LEAKTEST_ARGS='" + ' '.join(leakargs) +
+ "' python %(basedir)s/build/build/pymake/make.py leaktest")]
+
def formatBytes(bytes, sigDigits=3):
# Force a float calculation
View
4 steps/unittest.py
@@ -411,9 +411,9 @@ class ShellCommandReportTimeout(ShellCommand):
"""We subclass ShellCommand so that we can bubble up the timeout errors
to tinderbox that normally only get appended to the buildbot slave logs.
"""
- def __init__(self, **kwargs):
+ def __init__(self, timeout=2 * 3600, maxTime=4 * 3600, **kwargs):
self.my_shellcommand = ShellCommand
- ShellCommand.__init__(self, **kwargs)
+ ShellCommand.__init__(self, timeout=timeout, maxTime=maxTime, **kwargs)
def evaluateCommand(self, cmd):
superResult = self.my_shellcommand.evaluateCommand(self, cmd)
Please sign in to comment.
Something went wrong with that request. Please try again.