vbox的更動 67039 路徑 trunk/src/VBox/ValidationKit

時間撮記:

2017-5-23 上午11:33:27 (8 年 以前)

作者:

vboxsync

訊息:

ValidationKit: eliminate buggy task handling (oSession is always added by starting the VM and remmoved when terminating it, and oTxsSession can only be removed if it was added before)

位置:

trunk/src/VBox/ValidationKit/tests

檔案:

• additions/tdAddGuestCtrl.py (修改) (1 筆差異)
• autostart/tdAutostart1.py (修改) (1 筆差異)
• network/tdNetBenchmark1.py (修改) (1 筆差異)
• smoketests/tdSmokeTest1.py (修改) (1 筆差異)
• storage/tdStorageBenchmark1.py (修改) (1 筆差異)
• storage/tdStorageSnapshotMerging1.py (修改) (1 筆差異)
• storage/tdStorageStress1.py (修改) (1 筆差異)
• usb/tdUsb1.py (修改) (1 筆差異)

trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py

@@ -3657 +3657 @@
         reporter.log("TxsSession: %s" % (oTxsSession,));
         if oSession is not None:
-            self.addTask(oSession);
+            self.addTask(oTxsSession);
 
             fManual = False; # Manual override for local testing. (Committed version shall be False.)

trunk/src/VBox/ValidationKit/tests/autostart/tdAutostart1.py

@@ -654 +654 @@
             oSession, oTxsSession = self.startVmAndConnectToTxsViaTcp(sVmName, fCdWait = False, fNatForwardingForTxs = True);
             if oSession is not None:
-                self.addTask(oSession);
+                self.addTask(oTxsSession);
 
                 # Fudge factor - Allow the guest to finish starting up.

trunk/src/VBox/ValidationKit/tests/network/tdNetBenchmark1.py

@@ -499 +499 @@
             oSession, oTxsSession = self.startVmAndConnectToTxsViaTcp(sVmName, fCdWait = True);
             if oSession is not None:
-                self.addTask(oSession);
+                self.addTask(oTxsSession);
 
                 # Fudge factor - Allow the guest to finish starting up.

trunk/src/VBox/ValidationKit/tests/smoketests/tdSmokeTest1.py

@@ -155 +155 @@
         oSession, oTxsSession = self.startVmAndConnectToTxsViaTcp(oTestVm.sVmName, fCdWait = True);
         if oSession is not None:
-            self.addTask(oSession);
+            self.addTask(oTxsSession);
 
             ## @todo do some quick tests: save, restore, execute some test program, shut down the guest.

trunk/src/VBox/ValidationKit/tests/storage/tdStorageBenchmark1.py

@@ -1088 +1088 @@
                 oSession, oTxsSession = self.startVmAndConnectToTxsViaTcp(sVmName, fCdWait = False, fNatForwardingForTxs = True);
                 if oSession is not None:
-                    self.addTask(oSession);
+                    self.addTask(oTxsSession);
 
                     # Fudge factor - Allow the guest to finish starting up.

trunk/src/VBox/ValidationKit/tests/storage/tdStorageSnapshotMerging1.py

@@ -242 +242 @@
             oSession, oTxsSession = self.startVmAndConnectToTxsViaTcp(sVmName, fCdWait = False, fNatForwardingForTxs = True);
             if oSession is not None:
-                self.addTask(oSession);
+                self.addTask(oTxsSession);
 
                 # Fudge factor - Allow the guest to finish starting up.

trunk/src/VBox/ValidationKit/tests/storage/tdStorageStress1.py

@@ -396 +396 @@
             oSession, oTxsSession = self.startVmAndConnectToTxsViaTcp(sVmName, fCdWait = False, fNatForwardingForTxs = True);
             if oSession is not None:
-                self.addTask(oSession);
+                self.addTask(oTxsSession);
 
                 # Fudge factor - Allow the guest to finish starting up.

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

@@ -505 +505 @@
             oSession, oTxsSession = self.startVmAndConnectToTxsViaTcp(sVmName, fCdWait = False, fNatForwardingForTxs = False);
             if oSession is not None:
-                self.addTask(oSession);
+                self.addTask(oTxsSession);
 
                 # Fudge factor - Allow the guest to finish starting up.