fix errors on postgres

buildbot · Jul 13, 2013 · 5a9574d · 5a9574d
1 parent d6c7aab
commit 5a9574d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/master/buildbot/db/buildslaves.py b/master/buildbot/db/buildslaves.py
@@ -127,7 +127,7 @@ def thd(conn):
             try:
                 conn.execute(q,
                     {'buildslaveid': buildslaveid, 'masterid': masterid})
-            except sa.exc.IntegrityError:
+            except (sa.exc.IntegrityError, sa.exc.ProgrammingError):
                 # if the row is already present, silently fail..
                 pass
 

diff --git a/master/buildbot/test/unit/test_db_buildslaves.py b/master/buildbot/test/unit/test_db_buildslaves.py
@@ -371,7 +371,7 @@ def test_getBuildslaves_with_config_masterid_11_builderid_22(self):
 
     @defer.inlineCallbacks
     def test_buildslaveConnected_existing(self):
-        yield self.insertTestData(self.buildslave1_rows)
+        yield self.insertTestData(self.baseRows + self.buildslave1_rows)
 
         NEW_INFO = { 'other': [ 1, 2, 3] }
 
@@ -388,7 +388,7 @@ def test_buildslaveConnected_existing(self):
 
     @defer.inlineCallbacks
     def test_buildslaveConnected_already_connected(self):
-        yield self.insertTestData(self.buildslave1_rows + [
+        yield self.insertTestData(self.baseRows + self.buildslave1_rows + [
             fakedb.ConnectedBuildslave(id=888,
                 buildslaveid=self.BS1_ID, masterid=11),
         ])
@@ -400,7 +400,7 @@ def test_buildslaveConnected_already_connected(self):
 
     @defer.inlineCallbacks
     def test_buildslaveDisconnected(self):
-        yield self.insertTestData(self.buildslave1_rows + [
+        yield self.insertTestData(self.baseRows + self.buildslave1_rows + [
             fakedb.ConnectedBuildslave(id=888,
                 buildslaveid=self.BS1_ID, masterid=10),
             fakedb.ConnectedBuildslave(id=889,
@@ -414,7 +414,7 @@ def test_buildslaveDisconnected(self):
 
     @defer.inlineCallbacks
     def test_buildslaveDisconnected_already_disconnected(self):
-        yield self.insertTestData(self.buildslave1_rows)
+        yield self.insertTestData(self.baseRows + self.buildslave1_rows)
         yield self.db.buildslaves.buildslaveDisconnected(
                     buildslaveid=self.BS1_ID, masterid=11)
 
@@ -427,7 +427,7 @@ class RealTests(Tests):
     # tests that only "real" implementations will pass
 
     def test_buildslaveConnected_badJson(self):
-        d = self.insertTestData(self.buildslave1_rows)
+        d = self.insertTestData(self.baseRows + self.buildslave1_rows)
 
         @d.addCallback
         def corrupt(_):