[CalendarServer-changes] [9598] CalendarServer/branches/users/glyph/q

[source_changes at macosforge.org]

Revision: 9598
          http://trac.macosforge.org/projects/calendarserver/changeset/9598
Author:   glyph at apple.com
Date:     2012-08-11 01:54:40 -0700 (Sat, 11 Aug 2012)
Log Message:
-----------
Make assertResultList re-usable

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/q/twext/enterprise/dal/test/test_sqlsyntax.py
    CalendarServer/branches/users/glyph/q/twext/enterprise/test/test_adbapi2.py

Property Changed:
----------------
    CalendarServer/branches/users/glyph/q/

Modified: CalendarServer/branches/users/glyph/q/twext/enterprise/dal/test/test_sqlsyntax.py
===================================================================
--- CalendarServer/branches/users/glyph/q/twext/enterprise/dal/test/test_sqlsyntax.py	2012-08-11 08:54:39 UTC (rev 9597)
+++ CalendarServer/branches/users/glyph/q/twext/enterprise/dal/test/test_sqlsyntax.py	2012-08-11 08:54:40 UTC (rev 9598)
@@ -34,7 +34,7 @@
                                           SQLITE_DIALECT)
 from twext.enterprise.test.test_adbapi2 import ConnectionPoolHelper
 from twext.enterprise.test.test_adbapi2 import NetworkedPoolHelper
-from twext.enterprise.test.test_adbapi2 import resultOf
+from twext.enterprise.test.test_adbapi2 import resultOf, AssertResultHelper
 from twisted.internet.defer import succeed
 from twisted.trial.unittest import TestCase
 
@@ -129,7 +129,7 @@
 
 
 
-class GenerationTests(ExampleSchemaHelper, TestCase):
+class GenerationTests(ExampleSchemaHelper, TestCase, AssertResultHelper):
     """
     Tests for syntactic helpers to generate SQL queries.
     """
@@ -1033,7 +1033,7 @@
                       Return=self.schema.FOO.BAR)
         csql.nextResult([["sample row id"]])
         result = resultOf(stmt.on(csql))
-        self.assertEquals(
+        self.assertResultList(
             csql.execed,
             [
                 ["select rowid from FOO where BAR = :1", [4321]],

Modified: CalendarServer/branches/users/glyph/q/twext/enterprise/test/test_adbapi2.py
===================================================================
--- CalendarServer/branches/users/glyph/q/twext/enterprise/test/test_adbapi2.py	2012-08-11 08:54:39 UTC (rev 9597)
+++ CalendarServer/branches/users/glyph/q/twext/enterprise/test/test_adbapi2.py	2012-08-11 08:54:40 UTC (rev 9598)
@@ -66,6 +66,22 @@
 
 
 
+class AssertResultHelper(object):
+    """
+    Mixin for asserting about synchronous Deferred results.
+    """
+
+    def assertResultList(self, resultList, expected):
+        if not resultList:
+            self.fail("No result; Deferred didn't fire yet.")
+        else:
+            if isinstance(resultList[0], Failure):
+                resultList[0].raiseException()
+            else:
+                self.assertEqual(resultList, [expected])
+
+
+
 class Child(object):
     """
     An object with a L{Parent}, in its list of C{children}.
@@ -542,7 +558,7 @@
 
 
 
-class ConnectionPoolTests(ConnectionPoolHelper, TestCase):
+class ConnectionPoolTests(ConnectionPoolHelper, TestCase, AssertResultHelper):
     """
     Tests for L{ConnectionPool}.
     """
@@ -676,16 +692,6 @@
         self.assertEquals(holder.stopped, True)
 
 
-    def assertResultList(self, resultList, expected):
-        if not resultList:
-            self.fail("No result; Deferred didn't fire yet.")
-        else:
-            if isinstance(resultList[0], Failure):
-                resultList[0].raiseException()
-            else:
-                self.assertEqual(resultList, [expected])
-
-
     def test_shutdownDuringAttemptFailed(self):
         """
         If L{ConnectionPool.stopService} is called while a connection attempt
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120811/5b3d22ed/attachment-0001.html>