Merge branch 'encukou-markdown-identifiers'

[zzz-pokedex.git] / pokedex / tests / test_schema.py

diff --git a/pokedex/tests/test_schema.py b/pokedex/tests/test_schema.py
index 2ad795c..eb536ec 100644 (file)
--- a/pokedex/tests/test_schema.py
+++ b/pokedex/tests/test_schema.py
@@ -80,9 +80,12 @@ def test_i18n_table_creation():
     foo = Foo()
     sess.add(foo)
 
     foo = Foo()
     sess.add(foo)
 

-    # Commit so the above get primary keys filled in
+    # Commit so the above get primary keys filled in, then give the
+    # session the language id

     sess.commit()
     sess.commit()

-    sess.default_language = lang_en.id
+    # Note that this won't apply to sessions created in other threads, but that
+    # ought not be a problem!
+    sess.default_language_id = lang_en.id

 
     # Give our foo some names, as directly as possible
     foo_text = FooText()
 
     # Give our foo some names, as directly as possible
     foo_text = FooText()


@@ -178,7 +181,8 @@ def test_texts():
                 if format not in good_formats:
                     raise AssertionError(assert_text % column)
                 is_markdown = isinstance(column.type, markdown.MarkdownColumn)
                 if format not in good_formats:
                     raise AssertionError(assert_text % column)
                 is_markdown = isinstance(column.type, markdown.MarkdownColumn)

-                if is_markdown != (format == 'markdown'):
+                if is_markdown and (format != 'markdown'):
+                    # Note: regular string with markdown syntax is allowed

                     raise AssertionError('%s: markdown format/column type mismatch' % column)
                 if (format != 'identifier') and (column.name == 'identifier'):
                     raise AssertionError('%s: identifier column name/type mismatch' % column)
                     raise AssertionError('%s: markdown format/column type mismatch' % column)
                 if (format != 'identifier') and (column.name == 'identifier'):
                     raise AssertionError('%s: identifier column name/type mismatch' % column)


@@ -199,12 +203,8 @@ def test_texts():
                 assert column.nullable
 
 def test_identifiers_with_names():
                 assert column.nullable
 
 def test_identifiers_with_names():

-    """Test that named tables have identifiers, and non-named tables don't
-
-    ...have either names or identifiers.
+    """Test that named tables have identifiers

     """
     for table in sorted(tables.mapped_classes, key=lambda t: t.__name__):
         if hasattr(table, 'name'):
             assert hasattr(table, 'identifier'), table
     """
     for table in sorted(tables.mapped_classes, key=lambda t: t.__name__):
         if hasattr(table, 'name'):
             assert hasattr(table, 'identifier'), table

-        else:
-            assert not hasattr(table, 'identifier'), table