Changeset 100083 in vbox

Timestamp:

Jun 6, 2023 2:02:59 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

157772

Message:

/usb/usbgadget.py, changed taskThread and taskConnect function names to utsTaskThread and utdTaskConnet, same for used there logging

File:

• trunk/src/VBox/ValidationKit/tests/usb/usbgadget.py (modified) (5 diffs)

trunk/src/VBox/ValidationKit/tests/usb/usbgadget.py

@@ -512 +512 @@
         self.fTryConnect    = fTryConnect;
 
-        if not self.startTask(cMsTimeout, False, "connecting", self.taskConnect, (cMsIdleFudge,)):
+        if not self.startTask(cMsTimeout, False, "connecting", self.utsTaskConnect, (cMsIdleFudge,)):
             raise base.GenError("startTask failed");
 
@@ -562 +562 @@
         self.fnTask         = fnTask;
         self.aTaskArgs      = aArgs;
-        self.oThread        = threading.Thread(target=self.taskThread, args=(), name='UTS-%s' % (sStatus,));
+        self.oThread        = threading.Thread(target=self.utsTaskThread, args=(), name='UTS-%s' % (sStatus,));
         self.oThread.setDaemon(True); # pylint: disable=deprecated-method
         self.msStart        = base.timestampMilli();
@@ -608 +608 @@
         return oThread.is_alive();
 
-    def taskThread(self):
+    def utsTaskThread(self):
         """
         The task thread function.
@@ -618 +618 @@
                 oTaskRc = fnTask(*self.aTaskArgs);
             except:
-                reporter.fatalXcpt('taskThread', 15);
+                reporter.fatalXcpt('utsTaskThread', 15);
                 oTaskRc = None;
         else:
-            reporter.log('taskThread: cancelled already');
+            reporter.log('utsTaskThread: cancelled already');
 
         self.lockTask();
 
-        reporter.log('taskThread: signalling task with status "%s", oTaskRc=%s' % (self.sStatus, oTaskRc));
+        reporter.log('utsTaskThread: signalling task with status "%s", oTaskRc=%s' % (self.sStatus, oTaskRc));
         self.oTaskRc = oTaskRc;
         self.oThread = None;
@@ -760 +760 @@
     #
 
-    def taskConnect(self, cMsIdleFudge):
+    def utsTaskConnect(self, cMsIdleFudge):
         """Tries to connect to the UTS"""
         while not self.isCancelled():
-            reporter.log2('taskConnect: connecting ...');
+            reporter.log2('utsTaskConnect: connecting ...');
             rc = self.oTransport.connect(self.getMsLeft(500));
             if rc is True:
-                reporter.log('taskConnect: succeeded');
+                reporter.log('utsTaskConnect: succeeded');
                 return self.taskGreet(cMsIdleFudge);
             if rc is None:
-                reporter.log2('taskConnect: unable to connect');
+                reporter.log2('utsTaskConnect: unable to connect');
                 return None;
             if self.hasTimedOut():
-                reporter.log2('taskConnect: timed out');
+                reporter.log2('utsTaskConnect: timed out');
                 if not self.fTryConnect:
-                    reporter.maybeErr(self.fErr, 'taskConnect: timed out');
+                    reporter.maybeErr(self.fErr, 'utsTaskConnect: timed out');
                 return False;
             time.sleep(self.getMsLeft(1, 1000) / 1000.0);
         if not self.fTryConnect:
-            reporter.maybeErr(self.fErr, 'taskConnect: cancelled');
+            reporter.maybeErr(self.fErr, 'utsTaskConnect: cancelled');
         return False;