Commits

Anonymous committed 444e5e0

update tests for adodbapi names/methods

  • Participants
  • Parent commits addeb02

Comments (0)

Files changed (2)

tests/test_main/regressiontests/models.py

 import datetime
 import decimal
-from django.db import models, IntegrityError
+from django.db import models
 from django.test import TestCase
 from django.core.paginator import Paginator
 from sqlserver_ado.fields import BigAutoField, BigIntegerField, BigForeignKey
 
+from adodbapi import IntegrityError
+
 class Bug19Table(models.Model):
     """ A simple model for testing string comparisons.
     
     >>> choices = (
     ...     "no_slashes", "no_slashes_2",
     ...     r"C:\some_folder\somefile.ext", r"\some_folder",
-    ...     "some_folder"+'\',
+    ...     "some_folder" + '\\',
     ...     "[brackets]",
     ...     )
     >>> for c in choices:

tests/test_main/regressiontests/tests.py

            },
         }
         db_settings.update(data)
-        from sqlserver_ado.base import make_connection_string
-        return make_connection_string(db_settings)
+        from sqlserver_ado.base import make_connection_dict
+        dict = make_connection_dict(db_settings)
+        return dict['connection_string'] % dict
 
     def test_default(self):
         conn_string = self.get_conn_string()