cosmetic
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 10 Dec 2007 09:47:10 +0000 (09:47 +0000)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 10 Dec 2007 09:47:10 +0000 (09:47 +0000)
system/TestMain.py
system/TestPlc.py
system/TestSite.py

index 7e20464..7ce4f7b 100755 (executable)
@@ -29,7 +29,7 @@ myplc-url defaults to the last value used, as stored in URL"""
                               help="Run in debug mode for eventual virtual problems")
             #exporting Display
             parser.add_option("-d","--display", action="store", dest="Xterm", default='bellami:0.0',
-                              help="export the display on the mentionneted one")
+                              help="sets DISPLAY for vmplayer")
         
             (self.options, self.args) = parser.parse_args()
 
index fca88da..7f734f3 100644 (file)
@@ -24,7 +24,7 @@ class TestPlc:
                'AuthString':self.plc_spec['PLC_ROOT_PASSWORD'],
                 'Role' : self.plc_spec['role']
                 }
-    def affiche_results(self, test_case_name, status, timers):
+    def display_results(self, test_case_name, status, timers):
         timers=datetime.datetime.now()
         fileHandle = open (self.path+'/results.txt', 'a' )
         fileHandle.write ( str(test_case_name)+'                    ' +str(status)+'                    '+str(timers))
index f1b1dee..f79b8aa 100644 (file)
@@ -98,11 +98,11 @@ class TestSite:
                     try:
                         if (node_status[0] == bt):
                             test_name='\nTest Installation Node hosted: '+l['hostname']
-                            self.test_plc.affiche_results(test_name, 'Successful', '')##printing out the result
+                            self.test_plc.display_results(test_name, 'Successful', '')##printing out the result
                             break ##for exsiting and renaming virtual file to just installed
                         elif (node_status[0] ==dbg):
                             test_name='\nTest Installation Node hosted: '+l['hostname']
-                            self.test_plc.affiche_results(test_name, 'En Debug', '')##printing out the result
+                            self.test_plc.display_results(test_name, 'En Debug', '')##printing out the result
                             bool=False
                             break ##for exsiting and renaming virtual file to just installed
                         elif ( start_time  <= dead_time ) :
@@ -115,10 +115,10 @@ class TestSite:
                 if (bool):
                     print "Node correctly instaled and booted "
                 else :
-                    print "Node not fully booted "##cheek if configuration file already exist
+                    print "Node not fully booted "
                     ret_value=False
                     test_name='\nTest Installation Node Hosted: ',l['hostname']
-                    self.test_plc.affiche_results(test_name, 'Failure', '')##printing out the result
+                    self.test_plc.display_results(test_name, 'Failure', '')
             
             end=time.strftime("%H:%M:%S", time.localtime())
             print "time at the end is :",end  ##converting time to secondes