Adjust expected data types in tests.

diff --git a/tests/test_mwdb.py b/tests/test_mwdb.py
index 3e94135ee48ed5713ad42d0d87de12b0fdb25415..92a2b3e53133af2c83f9c3d52a8560c5b9384ded 100644 (file)
--- a/tests/test_mwdb.py
+++ b/tests/test_mwdb.py
@@ -83,14 +83,14 @@ class TestMySqlPython(unittest.TestCase):
 
     def test_datatype_page(self):
         result = self.exec_sql('select page_title, page_restrictions, page_touched from page where page_id = 1321')
-        self.assertEqual(type(result[0]), str)  # varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL
+        self.assertEqual(type(result[0]), bytes)  # varbinary(255) NOT NULL
         self.assertEqual(type(result[1]), bytes)  # tinyblob NOT NULL
         self.assertEqual(type(result[2]), bytes)  # binary(14) NOT NULL
 
     def test_datatype_revision(self):
         result = self.exec_sql('select rev_comment, rev_user_text, rev_timestamp from revision where rev_id = 7586')
         self.assertEqual(type(result[0]), bytes)  # tinyblob NOT NULL
-        self.assertEqual(type(result[1]), str)  # varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL
+        self.assertEqual(type(result[1]), bytes)  # varbinary(255) NOT NULL DEFAULT ''
         self.assertEqual(type(result[2]), bytes)  # binary(14) NOT NULL
 
     def test_datatypes_text(self):
@@ -100,12 +100,12 @@ class TestMySqlPython(unittest.TestCase):
 
     def test_datatype_user(self):
         result = self.exec_sql('select user_name, user_real_name, user_email from user where user_id = 1')
-        self.assertEqual(type(result[0]), str)  # varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL
-        self.assertEqual(type(result[1]), str)  # varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL
-        self.assertEqual(type(result[2]), str)  # tinytext NOT NULL
-        assert result[0] == 'Philipp'
+        self.assertEqual(type(result[0]), bytes)  # varbinary(255) NOT NULL DEFAULT ''
+        self.assertEqual(type(result[1]), bytes)  # varbinary(255) NOT NULL DEFAULT ''
+        self.assertEqual(type(result[2]), bytes)  # tinyblob NOT NULL
+        assert result[0].decode('UTF-8') == 'Philipp'
 
     def test_datatype_categorylinks(self):
         result = self.exec_sql('select cl_to, cl_sortkey from categorylinks where cl_from = 609')
-        self.assertEqual(type(result[0]), str)  # varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL
+        self.assertEqual(type(result[0]), bytes)  # varbinary(255) NOT NULL DEFAULT ''
         self.assertEqual(type(result[1]), bytes)  # varbinary(230) NOT NULL