Changeset 54621 in vbox for trunk/src/VBox/ValidationKit/testdriver

Timestamp:

Mar 4, 2015 1:55:45 PM (10 years ago)

Author:

vboxsync

Message:

validation kit: allow to overwrite features in the test script, don't assert

File:

• trunk/src/VBox/ValidationKit/testdriver/vbox.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/testdriver/vbox.py

@@ -2578 +2578 @@
         if fVBox is not None:
             if fEnv is not None:
-                assert fVBox == fEnv, 'Misconfigured TestBox: fVBox=%s (%s) vs. fEnv=%s (%s)' % (fVBox, sEnum, fEnv, sEnvVar);
+                if fEnv != fVBox and not fQuiet:
+                    reporter.log('TestBox configuration overwritten: fVBox=%s (%s) vs. fEnv=%s (%s)'
+                                 % (fVBox, sEnum, fEnv, sEnvVar));
+                return fEnv;
             return fVBox;
         if fEnv is not None: