Merge branch 'sopa-test'rel.0.1sopa-test

1 files changed, 54 insertions, 14 deletions

diff --git a/test-cli/test/tests/qram.py b/test-cli/test/tests/qram.py
index 8ec0210..49d4d54 100644
--- a/test-cli/test/tests/qram.py
+++ b/test-cli/test/tests/qram.py
@@ -1,22 +1,62 @@
-from test.helpers.syscmd import SysCommand
 import unittest
+import sh
+# from test.helpers.iseelogger import MeasureTime
+# from test.helpers.iseelogger import logObj
+from test.helpers.utils import save_file_to_disk
 
 class Qram(unittest.TestCase):
+    params = None
+    __memsize = None
+    __loops = None
+    __resultlist = []  # resultlist is a python list of python dictionaries
 
-    def __init__(self, testname, testfunc, memSize):
+    # varlist: memsize, loops
+    def __init__(self, testname, testfunc, varlist):
+        self.params = varlist
         super(Qram, self).__init__(testfunc)
-        self.__memSize = memSize
         self._testMethodDoc = testname
+        self.__xmlObj = varlist["xml"]
 
-    def execute(self):
-        str_cmd= "free -m"
-        free_command = SysCommand("free_ram", str_cmd)
-        if free_command.execute() == 0:
-            self.__raw_out = free_command.getOutput()
-            if self.__raw_out == "":
-                return -1
-            lines = free_command.getOutput().splitlines()
-            aux = [int(s) for s in lines[1].split() if s.isdigit()]
-            self.failUnless(int(aux[0])>int(self.__memSize),"failed: total ram memory size lower than expected")
+        self.__QramName = varlist.get('name', 'qram')
+        self.__loops = varlist.get('loops', self.__xmlObj.getKeyVal(self.__QramName, "loops", "1"))
+        self.__memsize = varlist.get('memsize', self.__xmlObj.getKeyVal(self.__QramName, "memsize", "50M"))
+        self.__toPath = varlist.get('to', self.__xmlObj.getKeyVal(self.__QramName, "to", "/mnt/station_ramdisk"))
+        self.__ram_res_file = varlist.get('ram_res_file', self.__xmlObj.getKeyVal(self.__QramName, "ram_res_file", "ram_res.txt"))
+
+        self.__dummytest = varlist.get('dummytest', self.__xmlObj.getKeyVal(self.__QramName, "dummytest", "0"))
+        self.__dummyresult = varlist.get('dummytestresult', self.__xmlObj.getKeyVal(self.__QramName, "dummytest", "0"))
+
+        memtesterPath = self.__xmlObj.getKeyVal(self.__QramName, "memtesterPath", '')
+
+        if memtesterPath == '':
+            self.myMemtester = sh.memtester
         else:
-            self.fail("failed: could not complete iperf command")
+            self.myMemtester = sh.Command(memtesterPath)
+
+    def execute(self):
+        self.__resultlist = []
+        try:
+            # mytime = MeasureTime()
+            res = self.myMemtester(self.__memsize, '{}'.format(self.__loops))
+            save_file_to_disk(filePath='{}/{}'.format(self.__toPath, self.__ram_res_file),
+                              description='Ram result test',
+                              mime='text/plain',
+                              data=res.stdout.decode('utf-8'),
+                              result=self.__resultlist)
+            # mytime.stop()
+        except sh.ErrorReturnCode as e:
+            save_file_to_disk(filePath='{}/{}'.format(self.__toPath, self.__ram_res_file),
+                              description='Ram result test',
+                              mime='text/plain',
+                              data=e.stdout.decode('utf-8'),
+                              result=self.__resultlist)
+            self.fail("failed: memtester {}::{}".format(str(e.exit_code), e.stdout.decode('utf-8')))
+
+        except Exception as details:
+            self.fail('Error: {}'.format(details))
+
+    def getresults(self):
+        return self.__resultlist
+
+    def gettextresult(self):
+        return ""