[pypy-commit] buildbot add-header-to-nightly: merge default into branch
Author: Matti Picus matti.pi...@gmail.com
Branch: add-header-to-nightly
Changeset: r896:d69069fecc21
Date: 2013-11-17 23:54 +0200
http://bitbucket.org/pypy/buildbot/changeset/d69069fecc21/
Log:merge default into branch
diff --git a/bot2/pypybuildbot/arm_master.py b/bot2/pypybuildbot/arm_master.py
--- a/bot2/pypybuildbot/arm_master.py
+++ b/bot2/pypybuildbot/arm_master.py
@@ -136,6 +136,7 @@
BUILDJITLINUXARM,
BUILDLINUXARMHF_RASPBIAN,
BUILDJITLINUXARMHF_RASPBIAN,
+BUILDJITLINUXARMHF_RARING,
]
schedulers = [
diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -857,6 +857,11 @@
#env={PYTHONPATH: ['download']}, # shouldn't be needed, but what
if it is set externally?
))
if host == 'tannit':
+self.addStep(ShellCmd(
+description=install jinja2,
+command=['install/bin/pip', 'install', 'jinja2'],
+workdir='./',
+haltOnFailure=True,))
pypy_c_rel = 'install/bin/python'
self.addStep(ShellCmd(
description=measure numpy compatibility,
diff --git a/bot2/pypybuildbot/master.py b/bot2/pypybuildbot/master.py
--- a/bot2/pypybuildbot/master.py
+++ b/bot2/pypybuildbot/master.py
@@ -214,18 +214,21 @@
# other platforms
#MACOSX32, # on minime
JITWIN32, # on aurora
-JITFREEBSD764, # on headless
-JITFREEBSD864, # on ananke
-JITFREEBSD964, # on exarkun's freebsd
+#JITFREEBSD764,# on headless
+#JITFREEBSD864,# on ananke
+JITFREEBSD964, # on tavendo
JITMACOSX64, # on xerxes
# buildbot selftest
PYPYBUILDBOT # on cobra
], branch='default', hour=0, minute=0),
Nightly(nightly-2-00, [
+NUMPY_64, # on tannit64, uses 1 core, takes about
15min.
+ # XXX maybe use a trigger instead?
JITBENCH, # on tannit32, uses 1 core (in part
exclusively)
JITBENCH64,# on tannit64, uses 1 core (in part
exclusively)
-], branch='default', hour=2, minute=0),
+
+], branch=None, hour=2, minute=0),
Nightly(nightly-2-00-py3k, [
LINUX64, # on allegro64, uses all cores
@@ -235,6 +238,7 @@
Nightly(nighly-ppc, [
JITONLYLINUXPPC64, # on gcc1
], branch='ppc-jit-backend', hour=1, minute=0),
+
CustomForceScheduler('Force Scheduler',
builderNames=[
PYPYBUILDBOT,
@@ -411,7 +415,7 @@
category: 'freebsd64'
},
{name : JITFREEBSD964,
- slavenames: ['hybridlogic'],
+ slavenames: ['hybridlogic', 'tavendo-freebsd-9.2-amd64'],
'builddir' : JITFREEBSD964,
'factory' : pypyJITTranslatedTestFactoryFreeBSD,
category: 'freebsd64'
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
[pypy-commit] buildbot add-header-to-nightly: fix regression to test status in directory listing
Author: Matti Picus matti.pi...@gmail.com Branch: add-header-to-nightly Changeset: r895:75c380a6cecc Date: 2013-11-17 23:53 +0200 http://bitbucket.org/pypy/buildbot/changeset/75c380a6cecc/ Log:fix regression to test status in directory listing diff --git a/bot2/pypybuildbot/pypylist.py b/bot2/pypybuildbot/pypylist.py --- a/bot2/pypybuildbot/pypylist.py +++ b/bot2/pypybuildbot/pypylist.py @@ -156,6 +156,10 @@ '''template based, uses master/templates/directory.html ''' +def render(self, request): +self.status = request.site.buildbot_service.getStatus() +return DirectoryLister.render(self, request) + def _getFilesAndDirectories(self, directory): dirs, files = DirectoryLister._getFilesAndDirectories(self, directory) rowClasses = itertools.cycle(['odd', 'even']) ___ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit
[pypy-commit] pypy default: close files in this test
Author: Brian Kearns bdkea...@gmail.com Branch: Changeset: r68197:00c1596ab741 Date: 2013-11-17 21:20 -0500 http://bitbucket.org/pypy/pypy/changeset/00c1596ab741/ Log:close files in this test diff --git a/lib-python/2.7/test/test_old_mailbox.py b/lib-python/2.7/test/test_old_mailbox.py --- a/lib-python/2.7/test/test_old_mailbox.py +++ b/lib-python/2.7/test/test_old_mailbox.py @@ -73,7 +73,9 @@ self.createMessage(cur) self.mbox = mailbox.Maildir(test_support.TESTFN) self.assertTrue(len(self.mbox) == 1) -self.assertTrue(self.mbox.next() is not None) +msg = self.mbox.next() +self.assertTrue(msg is not None) +msg.fp.close() self.assertTrue(self.mbox.next() is None) self.assertTrue(self.mbox.next() is None) @@ -81,7 +83,9 @@ self.createMessage(new) self.mbox = mailbox.Maildir(test_support.TESTFN) self.assertTrue(len(self.mbox) == 1) -self.assertTrue(self.mbox.next() is not None) +msg = self.mbox.next() +self.assertTrue(msg is not None) +msg.fp.close() self.assertTrue(self.mbox.next() is None) self.assertTrue(self.mbox.next() is None) @@ -90,8 +94,12 @@ self.createMessage(new) self.mbox = mailbox.Maildir(test_support.TESTFN) self.assertTrue(len(self.mbox) == 2) -self.assertTrue(self.mbox.next() is not None) -self.assertTrue(self.mbox.next() is not None) +msg = self.mbox.next() +self.assertTrue(msg is not None) +msg.fp.close() +msg = self.mbox.next() +self.assertTrue(msg is not None) +msg.fp.close() self.assertTrue(self.mbox.next() is None) self.assertTrue(self.mbox.next() is None) ___ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit
[pypy-commit] pypy default: fix this test for the bsd builder
Author: Brian Kearns bdkea...@gmail.com Branch: Changeset: r68198:edd6b3a3df4d Date: 2013-11-17 22:22 -0500 http://bitbucket.org/pypy/pypy/changeset/edd6b3a3df4d/ Log:fix this test for the bsd builder diff --git a/pypy/module/test_lib_pypy/test_grp_extra.py b/pypy/module/test_lib_pypy/test_grp_extra.py --- a/pypy/module/test_lib_pypy/test_grp_extra.py +++ b/pypy/module/test_lib_pypy/test_grp_extra.py @@ -16,7 +16,7 @@ except KeyError: continue assert g.gr_gid == 0 -assert g.gr_mem == ['root'] or g.gr_mem == [] +assert 'root' in g.gr_mem or g.gr_mem == [] assert g.gr_name == name assert isinstance(g.gr_passwd, str)# usually just 'x', don't hope :-) break ___ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit
