On 03/12/2014 11:41 AM, Plamen Dimitrov wrote:
The parameter 'other_tests_dirs' is already used for defining alternative
directory for virt tests and using it as a custom path for the env file is
ambiguous. It also forces the file in that directory for every user with
custom
virt tests. This commit separates the parameters allowing for custom env
directory and custom virt tests directory.
---
virt.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/virt.py b/virt.py
index fe536f6..91acb43 100644
--- a/virt.py
+++ b/virt.py
@@ -68,13 +68,15 @@ class virt(test.test):
utils_misc.set_log_file_dir(self.debugdir)
# Open the environment file
- env_path = params.get("vm_type")
- other_subtests_dirs = params.get("other_tests_dirs", "")
- if other_subtests_dirs:
- env_path = other_subtests_dirs
+ custom_env_path = params.get("custom_env_path", "")
+ if custom_env_path:
+ env_path = custom_env_path
+ else:
+ env_path = params.get("vm_type")
This looks fine, thanks.
env_filename = os.path.join(self.bindir, env_path,
params.get("env", "env"))
env = utils_env.Env(env_filename, self.env_version)
+ other_subtests_dirs = params.get("other_tests_dirs", "")
test_passed = False
t_type = None
_______________________________________________
Virt-test-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/virt-test-devel
_______________________________________________
Virt-test-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/virt-test-devel
