Author: gnichols Date: 2011-07-25 17:22:08 +0000 (Mon, 25 Jul 2011) New Revision: 1033

Modified: trunk/v7/certificationtest.py trunk/v7/hardwaretest.py Log: 725441 - FEAT: save command should store results on server for review

Modified: trunk/v7/certificationtest.py =================================================================== --- trunk/v7/certificationtest.py 2011-07-25 16:32:12 UTC (rev 1032) +++ trunk/v7/certificationtest.py 2011-07-25 17:22:08 UTC (rev 1033) @@ -149,7 +149,14 @@ element = self.findOrCreateElement(osElement, tag) return self.getTextNode(element).data

+ def getOSProductShortName(self): + longName = self.getOS(Tags.product) + if "Red Hat Enterprise Linux" in longName: + return "RHEL"

+ #otherwise + return longName + def appendTest(self, test): try: deviceClass = self.deviceClasses[test.getDeviceClass()].appendTest(test)

Modified: trunk/v7/hardwaretest.py =================================================================== --- trunk/v7/hardwaretest.py 2011-07-25 16:32:12 UTC (rev 1032) +++ trunk/v7/hardwaretest.py 2011-07-25 17:22:08 UTC (rev 1033) @@ -953,8 +953,7 @@ path += "/%s" % value self.makeDirectoryPath(path) serverPath.append(value) - for tag in Tags.name, Tags.release: - value = self.certification.getOS(tag) + for value in self.certification.getOSProductShortName(), self.certification.getOS(Tags.release): if len(value) > 0: path += "/%s" % value self.makeDirectoryPath(path)