carrotquest/django-clickhouse
1
1
Fork 0
mirror of https://github.com/carrotquest/django-clickhouse.git synced 2025-07-07 13:24:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix in test

Browse Source
This commit is contained in:
M1ha 2018-11-29 19:15:27 +05:00
parent 762c1aa10d
commit b52bfaccae
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/test_sync.py
View File

@ -1,4 +1,5 @@
import datetime import datetime
import logging
from subprocess import Popen from subprocess import Popen
from time import sleep from time import sleep
from unittest import expectedFailure from unittest import expectedFailure
@ -13,6 +14,8 @@ from django_clickhouse.migrations import migrate_app
from tests.clickhouse_models import ClickHouseTestModel, ClickHouseCollapseTestModel, ClickHouseMultiTestModel from tests.clickhouse_models import ClickHouseTestModel, ClickHouseCollapseTestModel, ClickHouseMultiTestModel
from tests.models import TestModel from tests.models import TestModel
logger = logging.getLogger('django-clickhouse')
class SyncTest(TransactionTestCase): class SyncTest(TransactionTestCase):
def setUp(self): def setUp(self):
@ -97,7 +100,6 @@ class SyncTest(TransactionTestCase):
self.assertEqual(obj.id, synced_data[0].id) self.assertEqual(obj.id, synced_data[0].id)
# @skip("This doesn't work due to different threads connection problems")
class KillTest(TransactionTestCase): class KillTest(TransactionTestCase):
TEST_TIME = 30 TEST_TIME = 30
maxDiff = None maxDiff = None
@ -130,7 +132,7 @@ class KillTest(TransactionTestCase):
if kill: if kill:
sleep(randint(0, 5)) sleep(randint(0, 5))
print('Killing: %d' % p_sync.pid) logger.debug('django-clickhouse: killing: %d' % p_sync.pid)
p_sync.kill() p_sync.kill()
else: else:
p_sync.wait() p_sync.wait()
@ -138,13 +140,13 @@ class KillTest(TransactionTestCase):
def test_kills(self): def test_kills(self):
test_script = os.path.join(os.path.dirname(__file__), 'kill_test_sub_process.py') test_script = os.path.join(os.path.dirname(__file__), 'kill_test_sub_process.py')
p_create = Popen(['python3', test_script, 'create', '--test-time', str(self.TEST_TIME)]) p_create = Popen(['python3', test_script, 'create', '--test-time', str(self.TEST_TIME)])
# p_update = Popen(['python3', test_script, 'update', '--test-time', str(self.TEST_TIME)]) p_update = Popen(['python3', test_script, 'update', '--test-time', str(self.TEST_TIME)])
start = now() start = now()
while (now() - start).total_seconds() < self.TEST_TIME: while (now() - start).total_seconds() < self.TEST_TIME:
self.sync_iteration() self.sync_iteration()
p_create.wait() p_create.wait()
# p_update.wait() p_update.wait()
self._check_data() self._check_data()