Add an option to let user download the .au3 script from a remote
server, and keep the original method to prepare the script.
This makes it possible to employ AutoIt tests that involve several
files.
new variants:
1. download,
if params.get("download") == "yes", download the scripts to guest,
else use the original method, echo the code into guest.
2. download_cmd,
What tool to use to download.
User can choose git, as in the sample file, svn, ftp, or wget,
or other preferred tools.
NOTE, this requires that the download tool is installed in the
guest, or the tools have been placed in winutils.iso.
3. rsc_server,
Resource server which contains the AutoIt script
and provide a download service.
4. dst_rsc_dir,
Destination of the AutoIt scripts in the guest.
i.e. the downloaded resource will be saved in this default dir.
5. autoit_entry,
Which .au3 file to start to run.
this will be useful if a test involves several .au3 files.
Signed-off-by: Cao, Chen <kcao@xxxxxxxxxx>
---
client/tests/kvm/kvm_tests.cfg.sample | 6 ++++
client/tests/kvm/tests/autoit.py | 45 ++++++++++++++++++++++----------
2 files changed, 37 insertions(+), 14 deletions(-)
diff --git a/client/tests/kvm/kvm_tests.cfg.sample b/client/tests/kvm/kvm_tests.cfg.sample
index 5e15b30..f688b97 100644
--- a/client/tests/kvm/kvm_tests.cfg.sample
+++ b/client/tests/kvm/kvm_tests.cfg.sample
@@ -169,6 +169,12 @@ variants:
variants:
- notepad:
autoit_script = autoit/notepad1.au3
+ - stub:
+ download = yes
+ download_cmd = "git clone"
+ rsc_server = "git://the.resource.server/autoit"
+ dst_rsc_dir = "C:\"
+ autoit_entry = "C:\autoit\stub\stub.au3"
- guest_s4: install setup unattended_install
type = guest_s4
diff --git a/client/tests/kvm/tests/autoit.py b/client/tests/kvm/tests/autoit.py
index 9435d7c..ed1d491 100644
--- a/client/tests/kvm/tests/autoit.py
+++ b/client/tests/kvm/tests/autoit.py
@@ -25,23 +25,40 @@ def run_autoit(test, params, env):
# Collect test parameters
binary = params.get("autoit_binary")
script = params.get("autoit_script")
+ autoit_entry = params.get("autoit_entry", "script.au3")
script_params = params.get("autoit_script_params", "")
timeout = float(params.get("autoit_script_timeout", 600))
- # Send AutoIt script to guest (this code will be replaced once we
- # support sending files to Windows guests)
- session.get_command_output("del script.au3", internal_timeout=0)
- file = open(kvm_utils.get_path(test.bindir, script))
- for line in file.readlines():
- # Insert a '^' before each character
- line = "".join("^" + c for c in line.rstrip())
- if line:
- # Append line to the file
- session.get_command_output("echo %s>>script.au3" % line,
- internal_timeout=0)
- file.close()
-
- command = "cmd /c %s script.au3 %s" % (binary, script_params)
+ # Download the script resource from a remote server, or
+ # prepare the script using rss?
+ if params.get("download") == "yes":
+ download_cmd = params.get("download_cmd")
+ rsc_server = params.get("rsc_server")
+ dst_rsc_dir = params.get("dst_rsc_dir")
+
+ # Change dir to dst_rsc_dir, and remove 'autoit' there, then
+ # download the resource.
+ rsc_cmd = "cd %s && (rmdir /s /q autoit || del /s /q autoit) && " \
+ "%s %s" % (dst_rsc_dir, download_cmd, rsc_server)
+
+ if session.get_command_status(rsc_cmd, timeout=timeout) != 0:
+ raise error.TestFail("Download test resource failed.")
+ logging.info("Download resource finished.")
+ else:
+ # Send AutoIt script to guest (this code will be replaced once we
+ # support sending files to Windows guests)
+ session.get_command_output("del script.au3", internal_timeout=0)
+ file = open(kvm_utils.get_path(test.bindir, script))
+ for line in file.readlines():
+ # Insert a '^' before each character
+ line = "".join("^" + c for c in line.rstrip())
+ if line:
+ # Append line to the file
+ session.get_command_output("echo %s>>script.au3" % line,
+ internal_timeout=0)
+ file.close()
+
+ command = "cmd /c %s %s %s" % (binary, autoit_entry, script_params)
logging.info("---------------- Script output ----------------")
status = session.get_command_status(command,
--
1.5.5.6
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
