[CalendarServer-changes] [12108] twext/trunk/twext/enterprise/dal/test

[source_changes at macosforge.org]

Revision: 12108
          http://trac.calendarserver.org//changeset/12108
Author:   wsanchez at apple.com
Date:     2013-12-13 20:34:13 -0800 (Fri, 13 Dec 2013)
Log Message:
-----------
More sqlparse not these awesomeness

Modified Paths:
--------------
    twext/trunk/twext/enterprise/dal/test/test_parseschema.py
    twext/trunk/twext/enterprise/dal/test/test_sqlsyntax.py

Modified: twext/trunk/twext/enterprise/dal/test/test_parseschema.py
===================================================================
--- twext/trunk/twext/enterprise/dal/test/test_parseschema.py	2013-12-14 04:28:31 UTC (rev 12107)
+++ twext/trunk/twext/enterprise/dal/test/test_parseschema.py	2013-12-14 04:34:13 UTC (rev 12108)
@@ -25,7 +25,8 @@
 try:
     from twext.enterprise.dal.parseschema import addSQLToSchema
 except ImportError:
-    addSQLToSchema = NotImplemented
+    def addSQLToSchema(*args, **kwargs):
+        raise SkipTest("addSQLToSchema is not available")
 
 from twisted.trial.unittest import TestCase, SkipTest
 
@@ -40,9 +41,6 @@
         """
         Createa a L{Schema}
         """
-        if addSQLToSchema is NotImplemented:
-            raise SkipTest("addSQLToSchema is not available")
-
         s = Schema(self.id())
         addSQLToSchema(s, string)
         return s

Modified: twext/trunk/twext/enterprise/dal/test/test_sqlsyntax.py
===================================================================
--- twext/trunk/twext/enterprise/dal/test/test_sqlsyntax.py	2013-12-14 04:28:31 UTC (rev 12107)
+++ twext/trunk/twext/enterprise/dal/test/test_sqlsyntax.py	2013-12-14 04:34:13 UTC (rev 12108)
@@ -18,8 +18,15 @@
 Tests for L{twext.enterprise.dal.syntax}
 """
 
+from twisted.internet.defer import succeed
+from twisted.trial.unittest import TestCase, SkipTest
+
 from twext.enterprise.dal import syntax
-from twext.enterprise.dal.parseschema import addSQLToSchema
+try:
+    from twext.enterprise.dal.parseschema import addSQLToSchema
+except ImportError:
+    def addSQLToSchema(*args, **kwargs):
+        raise SkipTest("addSQLToSchema is not available")
 from twext.enterprise.dal.syntax import (
     Select, Insert, Update, Delete, Lock, SQLFragment,
     TableMismatch, Parameter, Max, Len, NotEnoughValues,
@@ -38,8 +45,6 @@
 from twext.enterprise.test.test_adbapi2 import ConnectionPoolHelper
 from twext.enterprise.test.test_adbapi2 import NetworkedPoolHelper
 from twext.enterprise.test.test_adbapi2 import resultOf, AssertResultHelper
-from twisted.internet.defer import succeed
-from twisted.trial.unittest import TestCase
 from twext.enterprise.dal.syntax import Tuple
 from twext.enterprise.dal.syntax import Constant
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/2e9b160a/attachment.html>