Changeset: 7f8cbc19ffda for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7f8cbc19ffda
Modified Files:
testing/sqltest.py
Branch: Jan2022
Log Message:
Reserve self.data for a list of output rows, use self.output as unsplit string.
diffs (47 lines):
diff --git a/testing/sqltest.py b/testing/sqltest.py
--- a/testing/sqltest.py
+++ b/testing/sqltest.py
@@ -336,6 +336,7 @@ class MclientTestResult(TestCaseResult,
def __init__(self, test_case, **kwargs):
super().__init__(test_case, **kwargs)
self.did_run = False
+ self.output = ''
def _parse_error(self, err:str):
err_code = None
@@ -379,7 +380,7 @@ class MclientTestResult(TestCaseResult,
stdout=process.PIPE, stderr=process.PIPE) as p:
out, err = p.communicate(query)
if out:
- self.data = out
+ self.output = out
self.rowcount = self._get_row_count(out)
if err:
self.test_run_error = err
@@ -391,7 +392,7 @@ class MclientTestResult(TestCaseResult,
stdout=process.PIPE, stderr=process.PIPE) as p:
out, err = p.communicate()
if out:
- self.data = out
+ self.output = out
if err:
self.test_run_error = err
self.err_code, self.err_message =
self._parse_error(err)
@@ -402,7 +403,7 @@ class MclientTestResult(TestCaseResult,
def assertMatchStableOut(self, fout, ignore_headers=False):
stable = []
- data = list(filter(filter_junk, self.data.split('\n')))
+ data = list(filter(filter_junk, self.output.split('\n')))
with open(fout, 'r') as f:
stable = list(filter(filter_junk, f.read().split('\n')))
if ignore_headers:
@@ -438,7 +439,7 @@ class MclientTestResult(TestCaseResult,
return self
def assertDataResultMatch(self, expected):
- data = list(filter(filter_junk, self.data.split('\n')))
+ data = list(filter(filter_junk, self.output.split('\n')))
data = list(filter(filter_headers, data))
a, b = filter_matching_blocks(expected, data)
diff = list(difflib.unified_diff(a, b, fromfile='expected',
tofile='test'))
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
