diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2019-04-30 16:04:35 +0200 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2019-04-30 17:17:37 +0200 |
commit | 180f7c764ae9dbe85bfd281f62f6086cf95e5b7a (patch) | |
tree | db8d7522d1f46d2048d290e82a1205b5e302ad17 /lib/oeqa | |
parent | 7d5365723dbe74c10834a94284221fedd5a811b8 (diff) | |
download | meta-updater-180f7c764ae9dbe85bfd281f62f6086cf95e5b7a.tar.gz |
selftest: retry aktualizr failure check due to resource constraints.fix/thud/backport
For some reason it now often fails if you don't briefly pause first, so
just retry it if it fails a few times.
Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
Diffstat (limited to 'lib/oeqa')
-rw-r--r-- | lib/oeqa/selftest/cases/updater_qemux86_64.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64.py b/lib/oeqa/selftest/cases/updater_qemux86_64.py index c928093..9f32bcf 100644 --- a/lib/oeqa/selftest/cases/updater_qemux86_64.py +++ b/lib/oeqa/selftest/cases/updater_qemux86_64.py | |||
@@ -408,11 +408,18 @@ class ResourceControlTests(OESelftestTestCase): | |||
408 | 408 | ||
409 | def test_aktualizr_resource_control(self): | 409 | def test_aktualizr_resource_control(self): |
410 | print('Checking aktualizr was killed') | 410 | print('Checking aktualizr was killed') |
411 | stdout, stderr, retcode = self.qemu_command('systemctl --no-pager show aktualizr') | 411 | ran_ok = False |
412 | for delay in [5, 5, 5, 5]: | ||
413 | sleep(delay) | ||
414 | stdout, stderr, retcode = self.qemu_command('systemctl --no-pager show aktualizr') | ||
415 | if retcode == 0 and b'ExecMainStatus=9' in stdout: | ||
416 | ran_ok = True | ||
417 | break | ||
418 | self.assertTrue(ran_ok, 'Aktualizr was not killed') | ||
419 | |||
412 | self.assertIn(b'CPUWeight=1000', stdout, 'CPUWeight was not set correctly') | 420 | self.assertIn(b'CPUWeight=1000', stdout, 'CPUWeight was not set correctly') |
413 | self.assertIn(b'MemoryHigh=52428800', stdout, 'MemoryHigh was not set correctly') | 421 | self.assertIn(b'MemoryHigh=52428800', stdout, 'MemoryHigh was not set correctly') |
414 | self.assertIn(b'MemoryMax=1048576', stdout, 'MemoryMax was not set correctly') | 422 | self.assertIn(b'MemoryMax=1048576', stdout, 'MemoryMax was not set correctly') |
415 | self.assertIn(b'ExecMainStatus=9', stdout, 'Aktualizr was not killed') | ||
416 | 423 | ||
417 | self.qemu_command('systemctl --runtime set-property aktualizr MemoryMax=') | 424 | self.qemu_command('systemctl --runtime set-property aktualizr MemoryMax=') |
418 | self.qemu_command('systemctl restart aktualizr') | 425 | self.qemu_command('systemctl restart aktualizr') |