Changeset 80834 in vbox

Timestamp:

Sep 16, 2019 8:23:55 PM (5 years ago)

Author:

vboxsync

Message:

ValKit/tdAddGuestCtrl.py: Adjusted session environment tests to match current IPRT/main environment validation.

File:

• trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py (modified) (3 diffs)

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

@@ -2131 +2131 @@
         Tests the guest session environment changes.
         """
+        enmErrInvalidVarName = vbox.ComError.VBOX_E_IPRT_ERROR if self.oTstDrv.fpApiRev >= 6.1 else vbox.ComError.E_INVALIDARG;
         aoTests = [
             # Check basic operations.
@@ -2188 +2189 @@
             # Invalid variable names.
             tdTestSessionEx([
-                tdStepSessionSetEnv('', 'FOO', vbox.ComError.E_INVALIDARG),
+                tdStepSessionSetEnv('', 'FOO', enmErrInvalidVarName),
                 tdStepSessionCheckEnv(),
                 tdStepRequireMinimumApiVer(5.0), # 4.3 is too relaxed checking input!
-                tdStepSessionBulkEnv(['', 'foo=bar'], vbox.ComError.E_INVALIDARG),
+                tdStepSessionBulkEnv(['', 'foo=bar'], enmErrInvalidVarName),
                 tdStepSessionCheckEnv(),
-                tdStepSessionSetEnv('FOO=', 'BAR', vbox.ComError.E_INVALIDARG),
+                tdStepSessionSetEnv('FOO=', 'BAR', enmErrInvalidVarName),
                 tdStepSessionCheckEnv(),
                 ]),
@@ -2220 +2221 @@
         # Leading '=' in the name is okay for windows guests in 6.1 and later (for driver letter CWDs).
         if (self.oTstDrv.fpApiVer < 6.1 and self.oTstDrv.fpApiVer >= 5.0) or not oTestVm.isWindows():
-            aoTests.append(tdTestSessionEx([tdStepSessionSetEnv('=', '===', vbox.ComError.E_INVALIDARG),
+            aoTests.append(tdTestSessionEx([tdStepSessionSetEnv('=', '===', enmErrInvalidVarName),
                                             tdStepSessionCheckEnv(),
-                                            tdStepSessionSetEnv('=FOO', 'BAR', vbox.ComError.E_INVALIDARG),
+                                            tdStepSessionSetEnv('=FOO', 'BAR', enmErrInvalidVarName),
                                             tdStepSessionCheckEnv(),
-                                            tdStepSessionBulkEnv(['=', 'foo=bar'], vbox.ComError.E_INVALIDARG),
+                                            tdStepSessionBulkEnv(['=', 'foo=bar'], enmErrInvalidVarName),
                                             tdStepSessionCheckEnv(),
-                                            tdStepSessionBulkEnv(['=FOO', 'foo=bar'], vbox.ComError.E_INVALIDARG),
+                                            tdStepSessionBulkEnv(['=FOO', 'foo=bar'], enmErrInvalidVarName),
                                             tdStepSessionCheckEnv(),
                                             ]));