Infinidat/infi.clickhouse_orm
1
1
Fork 0
mirror of https://github.com/Infinidat/infi.clickhouse_orm.git synced 2025-02-21 10:40:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'TvoroG-develop' into develop

Browse Source
This commit is contained in:
Itai Shirav 2017-05-15 08:29:57 +03:00
commit 7ebf72705e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/test_readonly.py
View File

@ -2,6 +2,7 @@
import unittest import unittest
import six
from infi.clickhouse_orm.database import Database, DatabaseException from infi.clickhouse_orm.database import Database, DatabaseException
from infi.clickhouse_orm.models import Model from infi.clickhouse_orm.models import Model
from infi.clickhouse_orm.fields import * from infi.clickhouse_orm.fields import *
@ -25,7 +26,7 @@ class ReadonlyTestCase(TestCaseWithData):
with self.assertRaises(DatabaseException): with self.assertRaises(DatabaseException):
self.database.drop_database() self.database.drop_database()
except DatabaseException as e: except DatabaseException as e:
if 'Unknown user' in unicode(e): if 'Unknown user' in six.text_type(e):
raise unittest.SkipTest('Database user "%s" is not defined' % username) raise unittest.SkipTest('Database user "%s" is not defined' % username)
else: else:
raise raise
@ -56,4 +57,3 @@ class ReadOnlyModel(Model):
readonly = True readonly = True
name = StringField() name = StringField()