Merge pull request #2533 from tardyp/marathonFix

fix for trailing slash in marathon test
buildbot · Dec 9, 2016 · 0683989 · 0683989
2 parents 5483f7a + 9d38459
commit 0683989
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git 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()
diff --git 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

diff --git 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',