Attachment 316449 Details for Bug 461935 – hardwaretest.py patch to remove config.xml and plan.xml

[patch] hardwaretest.py patch to remove config.xml and plan.xml

hardwaretest.patch (text/plain), 6.86 KB, created by Greg Nichols on 2008-09-11 14:58:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2008-09-11 14:58:30 UTC

Size: 6.86 KB

patch

obsolete

>Index: hardwaretest.py
>===================================================================
>RCS file: /cvs/qa/hts/hts/hardwaretest.py,v
>retrieving revision 1.84
>diff -u -r1.84 hardwaretest.py
>--- hardwaretest.py	8 Sep 2008 16:07:44 -0000	1.84
>+++ hardwaretest.py	11 Sep 2008 14:56:45 -0000
>@@ -50,24 +50,17 @@
>         self.dataDirectory = self.options.data
>         self.dataStoreDirectory = "%s/store" % self.options.data
>         self.testDirectory = self.options.source
>-        self.configFile = "%s/%s" % (self.options.data, self.options.cfg)
>-        self.planFile = "%s/%s" % (self.options.data, self.options.plan)
>         self.resultsFile = "%s/%s" % (self.options.data, self.options.results)
>-        self.virtResultsFile = "%s/%s" % (self.options.data, self.options.virtResults)
>         self.testServer = self.options.server
>         self.Debugging = self.options.debug
>-        self.config = None
>-        self.plan = None
>-        self.results = None
>         self.certification = None 
>         self.runMode = self.options.mode
>         self.htsClassLibraryPath = "/usr/share/hts/lib" 
>         self.lockFile = "/var/lock/subsys/hts"
>-        self.commands = "discover", "plan", "run", "print", "submit", "certify", "server", "test", "version", "clean", "save"
>+        self.commands = "plan", "run", "print", "submit", "certify", "server", "test", "version", "clean", "save"
>     
>     def getOptions(self):
>         usage = "usage: %prog <command> [options]\n\ncommand:\n"\
>-                    "\tdiscover - discover system configuration\n"\
>                     "\tplan \t- plan certification testing\n"\
>                     "\tcertify - run certification test plan\n"\
>                     "\tprint \t- print certification test results\n"\
>@@ -85,10 +78,6 @@
>                         help="Directory for data files")
>         parser.add_option("-x","--source",action="store", type="string", dest="source",
>                         help="Directory countaining test source files")
>-        parser.add_option("-c","--cfg",action="store", type="string", dest="cfg",
>-                        help="Configuration file")
>-        parser.add_option("-p","--plan",action="store", type="string", dest="plan",
>-                        help="Test plan file")
>         parser.add_option("-r","--results",action="store", type="string", dest="results",
>                         help="Results file")
>         parser.add_option("-n","--server",action="store", type="string", dest="server",
>@@ -168,14 +157,10 @@
>         command = args[0]
>         
>         result = False
>-        if (command == 'discover'):
>-            result = self.doDiscover()
>-        elif (command == 'plan'):           
>+        if (command == 'plan'):           
>             result = self.doPlan()
>         elif (command == 'certify'):           
>             result = self.doCertify()
>-        elif (command == 'aggregate'):
>-            result = self.doAggregateVirt()
>         elif (command == 'print'):
>             result = self.doPrint()       
>         elif (command == 'save'):
>@@ -213,31 +198,11 @@
>             
>                 
>     def load(self, silent=False):
>-        # load the config, plan, and/or results
>         try:
>-            self.config = Certification(self.Debugging)
>-            self.config.load(self.configFile)     
>-            self.certification = self.config
>-        except IOError:
>-            self.config = None
>-            return
>-        if not silent:
>-            print "loaded configuration %s" % self.configFile
>-        try:
>-            self.plan = Certification(self.Debugging)
>-            self.plan.load(self.planFile)    
>-            self.certification = self.plan 
>-        except IOError:
>-            self.plan = None
>-            return
>-        if not silent:
>-            print "loaded plan %s" % self.planFile
>-        try:
>-            self.results = Certification(self.Debugging)
>-            self.results.load(self.resultsFile)     
>-            self.certification = self.results
>+            self.certification = Certification(self.Debugging)
>+            self.certification.load(self.resultsFile)     
>         except IOError:
>-            self.results = None
>+            self.certification = None
>             return
>         if not silent:
>             print "loaded results %s" % self.resultsFile
>@@ -265,9 +230,8 @@
>         if hostname:
>             self.certification.setOS(Tags.hostname, hostname)
>         self.certification.setDiscoverTime(self.getCurrentUTCTime())
>-        self.certification.save(self.configFile)
>-        print "saved configuration to %s" % self.configFile
>-        self.config = self.certification
>+        self.certification.save(self.resultsFile)
>+        print "saved configuration to %s" % self.resultsFile
>         return True
>     
>      
>@@ -275,10 +239,8 @@
>     def doPlan(self):      
>         self.load()
>         self.checkHAL()
>-        if not self.config:
>+        if not self.certification:
>             self.doDiscover()
>-              
>-        if not self.plan:
>             planner = Planner(self.options)
>             planner.analyse(self.testDirectory)
>             tests = planner.plan() 
>@@ -308,12 +270,8 @@
>             self.checkTestServer()
>             self.certification.setTestServer(self.testServer)
>        
>-        if self.results:
>-            file = self.resultsFile
>-        else:
>-            file = self.planFile
>-        self.certification.save(file)
>-        print "saved test plan to %s" % file
>+        self.certification.save(self.resultsFile)
>+        print "saved test plan to %s" % self.resultsFile
>         return True
> 
>     def doServer(self, args):
>@@ -389,7 +347,7 @@
>     def doCertify(self):
>         self.load()
>         self.checkHAL()
>-        if not self.plan:
>+        if not self.certification:
>             self.doPlan()
>             
>         if self.options.udi:
>@@ -537,9 +495,8 @@
>         return requestedTests
>          
>     def doRun(self):
>-         self.doDiscover()
>-         self.doPlan()
>-         return self.doCertify()
>+        """ run is synonym for certify """
>+        return self.doCertify()
>          
>     def doPrint(self, format="text"):
>         self.load(silent=True)
>@@ -625,9 +582,6 @@
>     def doClean(self):
>         if self.ui.promptConfirm("Are you sure you want to delete all test results?"):
>             self.removeLogFiles()
>-            if self.ui.promptConfirm("Would you like to delete the test plan as well?"):
>-                self.removePlan()
>-            print "done."
>         return True
>             
>        
>@@ -889,9 +843,8 @@
>              os.chdir("/var/log")
>         print "removing HTS logs ..."
>         os.system("rm -rf %s" % htsLogDir)
>-        # GBN just remove the results, not that plan (and config).
>         print "removing HTS results..."
>-        os.system("rm -f /var/hts/results.xml")
>+        os.system("rm -f %s" % self.resultsFile)
>         
>     def removePlan(self):
>         print "removing HTS test plan..."

Actions: View | Diff

Attachments on bug 461935: 316448 | 316449