From 2568588f4e78f4dbadff20841423d28815258291 Mon Sep 17 00:00:00 2001 From: Vitaliy Zakaznikov Date: Mon, 4 May 2020 12:03:52 -0400 Subject: [PATCH] Removing hex output in exceptions in uexpect.py. Fixing and re-enabling 00979_live_view_watch_continuous_aggregates.py test. --- ...isabled => 00979_live_view_watch_continuous_aggregates.py} | 1 + tests/queries/0_stateless/helpers/uexpect.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) rename tests/queries/0_stateless/{00979_live_view_watch_continuous_aggregates.py.disabled => 00979_live_view_watch_continuous_aggregates.py} (98%) diff --git a/tests/queries/0_stateless/00979_live_view_watch_continuous_aggregates.py.disabled b/tests/queries/0_stateless/00979_live_view_watch_continuous_aggregates.py similarity index 98% rename from tests/queries/0_stateless/00979_live_view_watch_continuous_aggregates.py.disabled rename to tests/queries/0_stateless/00979_live_view_watch_continuous_aggregates.py index 876b4334217..5aec9ac0a8b 100755 --- a/tests/queries/0_stateless/00979_live_view_watch_continuous_aggregates.py.disabled +++ b/tests/queries/0_stateless/00979_live_view_watch_continuous_aggregates.py @@ -30,6 +30,7 @@ with client(name='client1>', log=log) as client1, client(name='client2>', log=lo client1.send('CREATE LIVE VIEW test.lv AS SELECT toStartOfDay(time) AS day, location, avg(temperature) FROM test.mt GROUP BY day, location ORDER BY day, location') client1.expect(prompt) client1.send('WATCH test.lv FORMAT CSV') + client1.expect(r'0.*1' + end_of_block) client2.send("INSERT INTO test.mt VALUES ('2019-01-01 00:00:00','New York',60),('2019-01-01 00:10:00','New York',70)") client2.expect(prompt) client1.expect(r'"2019-01-01 00:00:00","New York",65,2') diff --git a/tests/queries/0_stateless/helpers/uexpect.py b/tests/queries/0_stateless/helpers/uexpect.py index f71b32a53e1..b71dd2f81a0 100644 --- a/tests/queries/0_stateless/helpers/uexpect.py +++ b/tests/queries/0_stateless/helpers/uexpect.py @@ -39,8 +39,8 @@ class ExpectTimeoutError(Exception): if self.pattern: s += 'for %s ' % repr(self.pattern.pattern) if self.buffer: - s += 'buffer %s ' % repr(self.buffer[:]) - s += 'or \'%s\'' % ','.join(['%x' % ord(c) for c in self.buffer[:]]) + s += 'buffer %s' % repr(self.buffer[:]) + #s += ' or \'%s\'' % ','.join(['%x' % ord(c) for c in self.buffer[:]]) return s class IO(object):