From 0b69f823ac0877cec535cd246148eda0b1bdbcab Mon Sep 17 00:00:00 2001 From: Harish Date: Wed, 22 Jan 2020 11:59:57 +0530 Subject: [PATCH] Fix: Memory API test to induce error through yaml Patch fixes memory API test to induce error through yaml and handle the same in test Signed-off-by: Harish --- memory/memory_api.py | 11 +++-------- memory/memory_api.py.data/memory_api.yaml | 8 ++++++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/memory/memory_api.py b/memory/memory_api.py index 747780fc3..7d4f8d53c 100644 --- a/memory/memory_api.py +++ b/memory/memory_api.py @@ -43,7 +43,7 @@ def copyutil(self, file_name): def setUp(self): smm = SoftwareManager() self.memsize = int(self.params.get( - 'memory_size', default=memory.meminfo.MemFree.m) * 1048576 * 0.5) + 'memory_size', default=(memory.meminfo.MemFree.m * 0.5)) * 1048576) self.induce_err = self.params.get('induce_err', default=0) for package in ['gcc', 'make']: @@ -54,7 +54,7 @@ def setUp(self): build.make(self.teststmpdir) - def test(self): + def test_memapi(self): os.chdir(self.teststmpdir) proc = process.SubProcess('./memory_api %s %s' % (self.memsize, self.induce_err), shell=True, allow_output_check='both') @@ -62,12 +62,7 @@ def test(self): while proc.poll() is None: pass - ret = process.system('./memory_api %s 1' % self.memsize, - shell=True, ignore_status=True) - if ret == 255: - self.log.info("Error obtained as expected") - - if proc.poll() != 0: + if proc.poll() not in [0, 255]: self.fail("Unexpected application abort, check for possible issues") def test_mremap(self): diff --git a/memory/memory_api.py.data/memory_api.yaml b/memory/memory_api.py.data/memory_api.yaml index 88ab4bc9f..4ed22343c 100644 --- a/memory/memory_api.py.data/memory_api.yaml +++ b/memory/memory_api.py.data/memory_api.yaml @@ -1,3 +1,7 @@ setup: - memory_size: 10 # in MB - induce_err: 1 + memory_size: 100 # in MB + error: !mux + wo_err: + induce_err: 0 + with_err: + induce_err: 1