1 files changed, 41 insertions, 15 deletions
diff --git a/test-cli/test/tests/qram.py b/test-cli/test/tests/qram.py
index 21a01c8..49d4d54 100644
--- a/test-cli/test/tests/qram.py
+++ b/test-cli/test/tests/qram.py
@@ -1,33 +1,59 @@
 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 = "10M"
-    __loops = "1"
-    __resultlist = None  # resultlist is a python list of python dictionaries
+    __memsize = None
+    __loops = None
+    __resultlist = []  # resultlist is a python list of python dictionaries
 
     # varlist: memsize, loops
     def __init__(self, testname, testfunc, varlist):
         self.params = varlist
         super(Qram, self).__init__(testfunc)
-        if "memsize" in varlist:
-            self.__memsize = varlist["memsize"]
-        else:
-            raise Exception('memsize param inside Qram must be defined')
-        if "loops" in varlist:
-            self.__loops = varlist["loops"]
-        else:
-            raise Exception('loops param inside Qram must be defined')
         self._testMethodDoc = testname
-        self.__resultlist = []
+        self.__xmlObj = varlist["xml"]
+
+        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.myMemtester = sh.Command(memtesterPath)
 
     def execute(self):
+        self.__resultlist = []
         try:
-            p = sh.memtester(self.__memsize, "1", _out="/dev/null")
+            # 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:
-            self.fail("failed: could not complete memtester command")
+            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