From 4550c33c785ed7384068e14e05a9373cf42a632b Mon Sep 17 00:00:00 2001 From: Pierre Tardy Date: Fri, 9 Dec 2016 15:52:23 +0100 Subject: [PATCH 1/3] fix for trailing slash in marathon test --- master/buildbot/test/unit/test_worker_marathon.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/master/buildbot/test/unit/test_worker_marathon.py b/master/buildbot/test/unit/test_worker_marathon.py index c977dbab024..ee00ef617b3 100644 --- a/master/buildbot/test/unit/test_worker_marathon.py +++ b/master/buildbot/test/unit/test_worker_marathon.py @@ -45,7 +45,7 @@ def loseConnection(self): self.n() -class TestHyperLatentWorker(unittest.SynchronousTestCase): +class TestMarathonLatentWorker(unittest.SynchronousTestCase): def setUp(self): self.reactor = TestReactor() _setReactor(self.reactor) @@ -62,19 +62,19 @@ class FakeResult(object): _setReactor(None) def test_constructor_normal(self): - worker = MarathonLatentWorker('bot', 'tcp://marathon.local/', 'foo', + worker = MarathonLatentWorker('bot', 'tcp://marathon.local', 'foo', 'bar', 'debian:wheezy') # class instanciation configures nothing self.assertEqual(worker._http, None) def makeWorker(self, **kwargs): kwargs.setdefault('image', 'debian:wheezy') - worker = MarathonLatentWorker('bot', 'tcp://marathon.local/', **kwargs) + worker = MarathonLatentWorker('bot', 'tcp://marathon.local', **kwargs) self.worker = worker master = fakemaster.make_master(testcase=self, wantData=True) self._http = self.successResultOf( fakehttpclientservice.HTTPClientService.getFakeService( - master, self, 'tcp://marathon.local/', auth=kwargs.get( + master, self, 'tcp://marathon.local', auth=kwargs.get( 'auth'))) worker.setServiceParent(master) worker.reactor = self.reactor From c473637bd8ee7a0a711684b73c86800b0366a120 Mon Sep 17 00:00:00 2001 From: Pierre Tardy Date: Fri, 9 Dec 2016 15:46:28 +0100 Subject: [PATCH 2/3] fix for older version of sqlite --- .../buildbot/db/migrate/versions/047_cascading_deletes.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/master/buildbot/db/migrate/versions/047_cascading_deletes.py b/master/buildbot/db/migrate/versions/047_cascading_deletes.py index 9b1fbd4edb6..eab91e23ea2 100644 --- a/master/buildbot/db/migrate/versions/047_cascading_deletes.py +++ b/master/buildbot/db/migrate/versions/047_cascading_deletes.py @@ -15,6 +15,7 @@ import sqlalchemy as sa from migrate.changeset.constraint import ForeignKeyConstraint +from migrate.exceptions import NotSupportedError from buildbot.util import sautils @@ -47,5 +48,8 @@ def upgrade(migrate_engine): for table, args, kwargs in fks_to_change: fk = ForeignKeyConstraint(*args, **kwargs) table.append_constraint(fk) - fk.drop() + try: + fk.drop() + except NotSupportedError: + pass # some versions of sqlite do not support drop, but will still update the fk fk.create() From 9d384591ba1610ab493da250967fb43eccd3c026 Mon Sep 17 00:00:00 2001 From: Pierre Tardy Date: Fri, 9 Dec 2016 16:58:08 +0100 Subject: [PATCH 3/3] Fix docutils until sphinx is compatible https://github.com/sphinx-doc/sphinx/issues/3212 --- master/setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/master/setup.py b/master/setup.py index d38157ded1f..5f26df6da2c 100755 --- a/master/setup.py +++ b/master/setup.py @@ -497,6 +497,7 @@ def define_plugin_entries(groups): 'idna >= 0.6', ], 'docs': [ + 'docutils<0.13.0' 'sphinx>1.4.0', 'sphinxcontrib-blockdiag', 'sphinxcontrib-spelling',