Author: gnichols
Date: 2010-01-13 14:54:05 +0000 (Wed, 13 Jan 2010)
New Revision: 308
Modified:
trunk/v7/documentbase.py
trunk/v7/hardwaretest.py
trunk/v7/report.py
trunk/v7/v7kudzu.py
trunk/v7/version.py
Log:
555045 - v7 R23 traceback on submit command - invalid device data
Modified: trunk/v7/documentbase.py
===================================================================
--- trunk/v7/documentbase.py 2010-01-13 01:13:44 UTC (rev 307)
+++ trunk/v7/documentbase.py 2010-01-13 14:54:05 UTC (rev 308)
@@ -186,7 +186,7 @@
# should never, ever get here!
print "Error: unknown device source %s" % source
- return None
+ raise Exception("Error: unknown device source %s"% source)
def merge(self, documentFilePath):
subdocument = DocumentBase()
Modified: trunk/v7/hardwaretest.py
===================================================================
--- trunk/v7/hardwaretest.py 2010-01-13 01:13:44 UTC (rev 307)
+++ trunk/v7/hardwaretest.py 2010-01-13 14:54:05 UTC (rev 308)
@@ -39,7 +39,7 @@
import v7.version
from v7.hal import Hal
from v7.v7kudzu import Kudzu
-from v7.device import Device
+from v7.device import Device, HalDevice
from v7.command import Command, V7CommandException
from v7.resultsengine import ResultsEngine
@@ -1038,7 +1038,7 @@
if not device:
print "Warning: unknown device: %s " % key
# create one from scratch
- device = Device(Constants.user)
+ device = HalDevice(dict())
if self.options.udi:
device.setUDI(self.options.udi)
Modified: trunk/v7/report.py
===================================================================
--- trunk/v7/report.py 2010-01-13 01:13:44 UTC (rev 307)
+++ trunk/v7/report.py 2010-01-13 14:54:05 UTC (rev 308)
@@ -304,7 +304,10 @@
hardwareOutFile = codecs.open(hardwareOutPath, "w", "utf-8")
devices = run.getDevices()
for device in devices:
- device.write(hardwareOutFile)
+ if device:
+ device.write(hardwareOutFile)
+ elif self.Debugging != Constants.off:
+ print "Warning: run has bad device data"
hardwareOutFile.close()
Modified: trunk/v7/v7kudzu.py
===================================================================
--- trunk/v7/v7kudzu.py 2010-01-13 01:13:44 UTC (rev 307)
+++ trunk/v7/v7kudzu.py 2010-01-13 14:54:05 UTC (rev 308)
@@ -68,7 +68,7 @@
def getDevice(self, udi):
for device in self.getDevices():
if device.getProperty("udi") == udi:
- return Device(Constants.kudzu, device)
+ return KudzuDevice(device)
return None
def dump(self):
Modified: trunk/v7/version.py
===================================================================
--- trunk/v7/version.py 2010-01-13 01:13:44 UTC (rev 307)
+++ trunk/v7/version.py 2010-01-13 14:54:05 UTC (rev 308)
@@ -1,4 +1,5 @@
# v7/version.py is automatically-generated - DO NOT EDIT
version = '1.0'
-release = '20'
+release = '23'
+rhel_version = '6'