From 1463de8ae13c3dec89f219da283cc70ec0b7bf1b Mon Sep 17 00:00:00 2001 From: "Dustin J. Mitchell" Date: Tue, 20 Aug 2013 22:42:46 -0400 Subject: [PATCH] only check that assertion is raised on fake DB and don't unit-test the Python interpreter's scoping rules.. --- .../buildbot/test/unit/test_db_buildsets.py | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/master/buildbot/test/unit/test_db_buildsets.py b/master/buildbot/test/unit/test_db_buildsets.py index 4aa4b8811d6..693a72b8f30 100644 --- a/master/buildbot/test/unit/test_db_buildsets.py +++ b/master/buildbot/test/unit/test_db_buildsets.py @@ -499,21 +499,6 @@ def thd(conn): d.addCallback(check) return d - @defer.inlineCallbacks - def test_addBuildset_bad_waited_for(self): - try: - result = yield self.db.buildsets.addBuildset(sourcestamps=[234], reason='because', - properties={}, builderNames=['bldr'], external_idstring='extid', - waited_for='wat', _reactor=self.clock) - except Exception, actual_exception: - pass - else: - actual_exception = None - - self.assertIdentical(AssertionError, type(actual_exception)) - self.assertRaises(NameError, lambda: result) - self.assertEqual(("waited_for should be boolean: 'wat'",), actual_exception.args) - class TestFakeDB(unittest.TestCase, Tests): @@ -524,6 +509,13 @@ def setUp(self): self.insertTestData = self.db.insertTestData return self.setUpTests() + def test_addBuildset_bad_waited_for(self): + # only the fake db asserts on the type of waited_for + d = self.db.buildsets.addBuildset(sourcestamps=[234], reason='because', + properties={}, builderNames=['bldr'], external_idstring='extid', + waited_for='wat', _reactor=self.clock) + self.assertFailure(d, AssertionError) + class TestRealDB(unittest.TestCase, connector_component.ConnectorComponentMixin,