- merge ben's patch with updates

1 files changed, 18 insertions, 6 deletions

diff --git a/test/requirements.py b/test/requirements.py
index 07b2afb2a..d1ee55e7d 100644
--- a/test/requirements.py
+++ b/test/requirements.py
@@ -295,8 +295,8 @@ class DefaultRequirements(SuiteRequirements):
     def empty_strings_varchar(self):
         """target database can persist/return an empty string with a varchar."""
 
-        return fails_if("oracle", 'oracle converts empty '
-                                'strings to a blank space')
+        return fails_if(["oracle"],
+                        'oracle converts empty strings to a blank space')
 
     @property
     def empty_strings_text(self):
@@ -306,6 +306,12 @@ class DefaultRequirements(SuiteRequirements):
         return exclusions.open()
 
     @property
+    def unicode_data(self):
+        return skip_if([
+            no_support("sybase", "no unicode driver support")
+            ])
+
+    @property
     def unicode_connections(self):
         """Target driver must support some encoding of Unicode across the wire."""
         # TODO: expand to exclude MySQLdb versions w/ broken unicode
@@ -338,15 +344,20 @@ class DefaultRequirements(SuiteRequirements):
                 lambda: not self._has_cextensions(), "C extensions not installed"
                 )
 
-
     @property
     def emulated_lastrowid(self):
         """"target dialect retrieves cursor.lastrowid or an equivalent
         after an insert() construct executes.
         """
         return fails_on_everything_except('mysql+mysqldb', 'mysql+oursql',
-                                       'sqlite+pysqlite', 'mysql+pymysql',
-                                       'mssql+pyodbc', 'mssql+mxodbc')
+                                      'sqlite+pysqlite', 'mysql+pymysql',
+                                      'sybase', 'mssql+pyodbc', 'mssql+mxodbc')
+
+    @property
+    def implements_get_lastrowid(self):
+        return skip_if([
+            no_support('sybase', 'not supported by database'),
+            ])
 
     @property
     def dbapi_lastrowid(self):
@@ -373,7 +384,8 @@ class DefaultRequirements(SuiteRequirements):
     def reflects_pk_names(self):
         """Target driver reflects the name of primary key constraints."""
 
-        return fails_on_everything_except('postgresql', 'oracle', 'mssql')
+        return fails_on_everything_except('postgresql', 'oracle', 'mssql',
+                    'sybase')
 
     @property
     def datetime(self):