Attachment 314830 Details for Bug 447769 – hts/hardwaretest.py patch to change plan --add command

[patch] hts/hardwaretest.py patch to change plan --add command

hardwaretest.patch (text/plain), 3.38 KB, created by Greg Nichols on 2008-08-22 18:51:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2008-08-22 18:51:25 UTC

Size: 3.38 KB

patch

obsolete

>Index: hardwaretest.py
>===================================================================
>RCS file: /cvs/qa/hts/hts/hardwaretest.py,v
>retrieving revision 1.83
>diff -u -r1.83 hardwaretest.py
>--- hardwaretest.py	17 Jul 2008 00:30:57 -0000	1.83
>+++ hardwaretest.py	22 Aug 2008 18:29:25 -0000
>@@ -790,42 +830,50 @@
>         print (output + " %u tests") % len(tests)   
>         
>     def addTest(self):     
>-        if not self.options.test  or (not self.options.udi and not self.options.device):
>-            print "Must specify a test and a device, use --test <test name> --udi <device udi> or --device <logical device name> to specify device"
>+        if not self.options.test:
>+            print "Must specify a test , use --test <test name>"
>             return
>         
>-        # otherwise, get the device
>-        planner = Planner(self.options)
>-        if self.options.udi:
>-            key = self.options.udi[0]
>-            device = planner.getDeviceByUDI(key)
>-        elif self.options.device:
>-            key = self.options.device
>-            device = planner.getDeviceByName(key)
>-            
>-        if not device:
>-            print "Warning: unknown device: %s " % key
>-            # create one from scratch
>-            device = Device(Constants.user)
>-            if self.options.udi:
>-                device.setUDI(self.options.udi)
>-
>-        
>-        # otherwise, get the test to be added     
>+        # otherwise, get the test to be added   
>+        planner = Planner(self.options)  
>         planner.analyse(self.testDirectory)
>+        
>         try:
>             test = planner.getTest(self.options.test[0])
>+            test = copy.copy(test)
>         except KeyError:
>             print "No such test %s" % self.options.test
>             return
>         
>-        # add the test
>-        if self.Debugging:
>-            print "added test: %s for device: %s" % (test, device.getProperty('info.product'))
>-        test = copy.copy(test)
>-        test.setDevice(device)
>-        if self.options.device:
>-            test.setLogicalDeviceName(self.options.device)
>+        if not self.options.udi and not self.options.device:
>+            print "Warning: No device specified with --udi <device udi> or --device <logical device name>"
>+            if not self.ui.promptConfirm("Are you sure the test does not require a specific device?"):
>+                return
>+        else:
>+            
>+            if self.options.udi:
>+                key = self.options.udi[0]
>+                device = planner.getDeviceByUDI(key)
>+            elif self.options.device:
>+                key = self.options.device
>+                device = planner.getDeviceByName(key)
>+                
>+            if not device:
>+                print "Warning: unknown device: %s " % key
>+                # create one from scratch
>+                device = Device(Constants.user)
>+                if self.options.udi:
>+                    device.setUDI(self.options.udi)
>+                    
>+            test.setDevice(device)
>+            if self.options.device:
>+                test.setLogicalDeviceName(self.options.device)
>+
>+        
>+            if self.Debugging:
>+                print "added test: %s for device: %s" % (test, device.getProperty('info.product'))
>+            
>+        
>         self.certification.appendTest(test)               
>         self.certification.setPlanTime(self.getCurrentUTCTime()) 
>         print "Added test"

Actions: View | Diff

Attachments on bug 447769: 314830 | 314831