[CalendarServer-changes] [12106] twext/trunk/twext/enterprise/dal/test/test_record.py

source_changes at macosforge.org source_changes at macosforge.org
Wed Mar 12 11:23:02 PDT 2014


Revision: 12106
          http://trac.calendarserver.org//changeset/12106
Author:   wsanchez at apple.com
Date:     2013-12-13 20:28:08 -0800 (Fri, 13 Dec 2013)
Log Message:
-----------
Handle no sqlparse.

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

Modified: twext/trunk/twext/enterprise/dal/test/test_record.py
===================================================================
--- twext/trunk/twext/enterprise/dal/test/test_record.py	2013-12-14 04:20:55 UTC (rev 12105)
+++ twext/trunk/twext/enterprise/dal/test/test_record.py	2013-12-14 04:28:08 UTC (rev 12106)
@@ -20,17 +20,14 @@
 
 import datetime
 
-from twisted.internet.defer import inlineCallbacks
+from twisted.internet.defer import inlineCallbacks, gatherResults, returnValue
+from twisted.trial.unittest import TestCase, SkipTest
 
-from twisted.trial.unittest import TestCase
-
 from twext.enterprise.dal.record import (
     Record, fromTable, ReadOnly, NoSuchRecord
 )
 from twext.enterprise.dal.test.test_parseschema import SchemaTestHelper
 from twext.enterprise.dal.syntax import SchemaSyntax
-from twisted.internet.defer import gatherResults
-from twisted.internet.defer import returnValue
 from twext.enterprise.fixtures import buildConnectionPool
 
 # from twext.enterprise.dal.syntax import
@@ -51,18 +48,26 @@
 create sequence myseq;
 """ + schemaString
 
-testSchema = SchemaSyntax(sth.schemaFromString(parseableSchemaString))
+try:
+    testSchema = SchemaSyntax(sth.schemaFromString(parseableSchemaString))
+except SkipTest as e:
+    Alpha = Delta = object
+    skip = e
+else:
+    Alpha = fromTable(testSchema.ALPHA)
+    Delta = fromTable(testSchema.DELTA)
+    skip = False
 
 
 
-class TestRecord(Record, fromTable(testSchema.ALPHA)):
+class TestRecord(Record, Alpha):
     """
     A sample test record.
     """
 
 
 
-class TestAutoRecord(Record, fromTable(testSchema.DELTA)):
+class TestAutoRecord(Record, Delta):
     """
     A sample test record with default values specified.
     """
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/3c36c915/attachment.html>


More information about the calendarserver-changes mailing list