Removing hex output in exceptions in uexpect.py.

Fixing and re-enabling 00979_live_view_watch_continuous_aggregates.py test.
This commit is contained in:
Vitaliy Zakaznikov 2020-05-04 12:03:52 -04:00
parent 3a0b77132d
commit 2568588f4e
2 changed files with 3 additions and 2 deletions

View File

@ -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.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.expect(prompt)
client1.send('WATCH test.lv FORMAT CSV') 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.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) client2.expect(prompt)
client1.expect(r'"2019-01-01 00:00:00","New York",65,2') client1.expect(r'"2019-01-01 00:00:00","New York",65,2')

View File

@ -39,8 +39,8 @@ class ExpectTimeoutError(Exception):
if self.pattern: if self.pattern:
s += 'for %s ' % repr(self.pattern.pattern) s += 'for %s ' % repr(self.pattern.pattern)
if self.buffer: if self.buffer:
s += 'buffer %s ' % repr(self.buffer[:]) s += 'buffer %s' % repr(self.buffer[:])
s += 'or \'%s\'' % ','.join(['%x' % ord(c) for c in self.buffer[:]]) #s += ' or \'%s\'' % ','.join(['%x' % ord(c) for c in self.buffer[:]])
return s return s
class IO(object): class IO(object):