vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-04-20 19:38:39 +00:00
Code Issues Projects Releases Wiki Activity

system-tests: improve sorted compare

Browse Source 
sort both aptly output and gold file. output original output for
debugging on failure.

* Makefile: enable CAPTURE=1 env variable for capturing gold files
* docker-system-test: use AWS env vars for S3 tests
* fix system tests timing issue with order of gpg logs in publish tests
This commit is contained in:
André Roth
2025-04-21 14:13:37 +02:00
parent c07bf2b108
commit 22bc2f9d0f
5 changed files with 66 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
system/lib.py
View File

@@ -289,8 +289,6 @@ class BaseTest(object):
def run(self):
output = self.run_cmd(self.runCmd, self.expectedCode)
if self.sortOutput:
output = self.sort_lines(output)
self.output = self.output_processor(output)
def _start_process(self, command, stderr=subprocess.STDOUT, stdout=None):
@@ -493,24 +491,29 @@ class BaseTest(object):
return a.decode('utf-8')
return a
def verify_match(self, a, b, match_prepare=None, ensure_utf8=True):
def verify_match(self, gold, orig, match_prepare=None, ensure_utf8=True):
output = orig
if ensure_utf8:
a = self.ensure_utf8(a)
b = self.ensure_utf8(b)
gold = self.ensure_utf8(gold)
output = self.ensure_utf8(output)
if match_prepare is not None:
a = match_prepare(a)
b = match_prepare(b)
gold = match_prepare(gold)
output = match_prepare(output)
# sort if requested
if self.sortOutput:
gold = self.sort_lines(gold)
output = self.sort_lines(output)
# strip trailing whitespace and newlines
a = a.strip()
b = b.strip()
gold = gold.strip()
output = output.strip()
if a != b:
if gold != output:
diff = "".join(difflib.unified_diff(
[l + "\n" for l in a.split("\n")], [l + "\n" for l in b.split("\n")]))
raise Exception("content doesn't match:\n" + diff + "\n")
[l + "\n" for l in gold.split("\n")], [l + "\n" for l in output.split("\n")]))
raise Exception("content doesn't match:\n" + diff + "\n\nOutput:\n" + orig + "\n")
check = check_output