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

1 files changed, 60 insertions, 30 deletions

diff --git a/test-cli/test/tests/qeeprom.py b/test-cli/test/tests/qeeprom.py
index f72f78f..7900381 100644
--- a/test-cli/test/tests/qeeprom.py
+++ b/test-cli/test/tests/qeeprom.py
@@ -1,38 +1,68 @@
-from test.helpers.syscmd import SysCommand
 import unittest
-import uuid
+import os
 
 class Qeeprom(unittest.TestCase):
+    params = None
+    __resultlist = None  # resultlist is a python list of python dictionaries
+    __QEepromName = None
+    __i2cBus = None
+    __device = None
 
-    def __init__(self, testname, testfunc):
+    # varlist: position,  eeprompath
+    def __init__(self, testname, testfunc, varlist):
+        self.params = varlist
         super(Qeeprom, self).__init__(testfunc)
         self._testMethodDoc = testname
+        self.__xmlObj = varlist["xml"]
+        self.__QEepromName = varlist.get('name', 'qeeprom')
+        self.__i2cAddress = varlist.get('i2c_address', self.__xmlObj.getKeyVal(self.__QEepromName, "i2c_address", "0050"))
+        self.__i2cBus = varlist.get('i2c_bus', self.__xmlObj.getKeyVal(self.__QEepromName, "i2c_bus", "0"))
+        self.__device = '/sys/bus/i2c/devices/{}-{}/eeprom'.format(self.__i2cBus, self.__i2cAddress)
+
+        self.__resultlist = []
+
+    def __check_device(self):
+        if os.path.isfile(self.__device):
+            return True
+        return False
+
+    def __eeprom_write(self, data):
+        try:
+            f = open(self.__device, "wb")
+            f.write(data)
+            f.close()
+        except IOError as Error:
+            return False, '{}'.format(Error.errno)
+        return True, ''
+
+    def __eeprom_read(self, size):
+        try:
+            f = open(self.__device, "rb")
+            data = f.read(size)
+            f.close()
+        except IOError as Error:
+            return False, '{}'.format(Error.errno)
+        return True, data
+
 
     def execute(self):
-        str_cmd = "find /sys/ -iname 'eeprom'"
-        eeprom_location = SysCommand("eeprom_location", str_cmd)
-        if eeprom_location.execute() == 0:
-            self.__raw_out = eeprom_location.getOutput()
-            if self.__raw_out == "":
-                self.fail("Unable to get EEPROM location. IS EEPROM CONNECTED?")
-                return -1
-            eeprom=self.__raw_out.decode('ascii')
-            test_uuid = uuid.uuid4()
-            str_cmd="echo '{}' > {}".format(str(test_uuid), eeprom)
-            eeprom_write = SysCommand("eeprom_write", str_cmd)
-            if eeprom_write.execute() == 0:
-                self.__raw_out = eeprom_write.getOutput()
-                if self.__raw_out == "":
-                    self.fail("Unable to write on the EEPROM?")
-                    return -1
-                str_cmd = "head -2 {}".format(eeprom)
-                eeprom_read = SysCommand("eeprom_read", str_cmd)
-                if eeprom_read.execute() == 0:
-                    self.__raw_out = eeprom_read.getOutput()
-                    if self.__raw_out == "":
-                        self.fail("Unable to read from the EEPROM?")
-                        return -1
-                    if(str(self.__raw_out).find(str(test_uuid)) == -1):
-                        self.fail("failed: READ/WRITE mismatch")
-        else:
-            self.fail("failed: could not complete find eeprom command")
+        if not self.__check_device():
+            self.fail("cannot open device {}".format(self.__device))
+
+        data = bytes('AbcDeFgHijK098521', 'utf-8')
+
+        v, w = self.__eeprom_write(data)
+        if not v:
+            self.fail("eeprom: {} write test failed".format(w))
+        v, r = self.__eeprom_read(len(data))
+        if not v:
+            self.fail("eeprom: {} read test failed".format(r))
+        if r != data:
+            self.fail("mismatch between write and read bytes")
+
+
+    def getresults(self):
+        return self.__resultlist
+
+    def gettextresult(self):
+        return ""