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

[source_changes at macosforge.org]

Revision: 9599
          http://trac.macosforge.org/projects/calendarserver/changeset/9599
Author:   glyph at apple.com
Date:     2012-08-11 01:54:40 -0700 (Sat, 11 Aug 2012)
Log Message:
-----------
Assert in the correct order so that a useful error will be displayed, if there's an error.

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/q/twext/enterprise/dal/test/test_sqlsyntax.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:40 UTC (rev 9598)
+++ CalendarServer/branches/users/glyph/q/twext/enterprise/dal/test/test_sqlsyntax.py	2012-08-11 08:54:40 UTC (rev 9599)
@@ -1033,7 +1033,11 @@
                       Return=self.schema.FOO.BAR)
         csql.nextResult([["sample row id"]])
         result = resultOf(stmt.on(csql))
-        self.assertResultList(
+        # Three statements were executed; make sure that the result returned was
+        # the result of executing the last one.
+        self.assertResultList(result, 2)
+        # Check that they were the right statements.
+        self.assertEqual(
             csql.execed,
             [
                 ["select rowid from FOO where BAR = :1", [4321]],
@@ -1041,9 +1045,6 @@
                 ["select BAR from FOO where rowid = :1", ["sample row id"]],
             ],
         )
-        # Three statements were executed; make sure that the result returned was
-        # the result of executing the last one.
-        self.assertEquals(result, [2])
 
 
     def test_insertMismatch(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120811/2ac9be81/attachment.html>