diff options
| author | Laurent Bonnans <laurent.bonnans@here.com> | 2019-05-07 16:14:03 +0200 |
|---|---|---|
| committer | Laurent Bonnans <laurent.bonnans@here.com> | 2019-05-07 16:14:03 +0200 |
| commit | aff2440b3f1e57d92d5e8015d0e7c3e993944a3e (patch) | |
| tree | 038191f9459f6accedbdf516d004218321fbda13 | |
| parent | 6e35fce737605ce41050c4e4decb6f7c66671cd5 (diff) | |
| download | meta-updater-aff2440b3f1e57d92d5e8015d0e7c3e993944a3e.tar.gz | |
More robust aktualizr-ptest printing of errors
If ctest is interrupted (e.g. timeout), its partial output will be in
/tmp/aktualizr-ptest.log.tmp
Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com>
| -rw-r--r-- | lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py b/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py index a04032c..8783fe0 100644 --- a/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py +++ b/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py | |||
| @@ -41,12 +41,12 @@ class PtestTests(OESelftestTestCase): | |||
| 41 | stdout, stderr, retcode = self.qemu_command('sh -l -c ptest-runner', timeout=None) | 41 | stdout, stderr, retcode = self.qemu_command('sh -l -c ptest-runner', timeout=None) |
| 42 | output = stdout.decode() | 42 | output = stdout.decode() |
| 43 | print(output) | 43 | print(output) |
| 44 | self.assertEqual(retcode, 0) | ||
| 45 | 44 | ||
| 46 | has_failure = re.search('^FAIL', output, flags=re.MULTILINE) is not None | 45 | has_failure = re.search('^FAIL', output, flags=re.MULTILINE) is not None |
| 47 | if has_failure: | 46 | if has_failure: |
| 48 | print("Full test suite log:") | 47 | print("Full test suite log:") |
| 49 | stdout, stderr, retcode = self.qemu_command('cat /tmp/aktualizr-ptest.log', timeout=None) | 48 | stdout, _, _ = self.qemu_command('sh -c "cat /tmp/aktualizr-ptest.log || cat /tmp/aktualizr-ptest.log.tmp"', timeout=None) |
| 50 | print(stdout.decode()) | 49 | print(stdout.decode()) |
| 51 | 50 | ||
| 51 | self.assertEqual(retcode, 0) | ||
| 52 | self.assertFalse(has_failure) | 52 | self.assertFalse(has_failure) |
