Merge pull request #1299 from xiywang/ovs_website_win

openflow_acl_test.xxx.website: use curl instead of lynx in win guests

qemu/tests/cfg/openflow_acl_test.cfg

@@ -15,11 +15,14 @@
             prepare_cmd_linux = echo "autotest page" > /var/www/html/autotest-test.html
             cleanup_cmd_linux = rm -rf /var/www/html/autotest-test.html
             access_cmd_linux = curl -L http://ACCESS_TARGET/autotest-test.html --connect-timeout 10
-            access_cmd_windows = cd C:\lynx && C:\lynx\lynx.exe --dump http://ACCESS_TARGET/autotest-test.html
+            curl_win_path = C:\curl\
+            access_cmd_windows = cd C:\curl && curl.exe -k -L http://ACCESS_TARGET/autotest-test.html --connect-timeout 10
             setup_cmd_windows = start /w pkgmgr /iu:IIS-WebServerRole;IIS-WebServer
             prepare_cmd_windows = echo "autotest page" > C:\inetpub\wwwroot\autotest-test.html
             cleanup_cmd_windows =
             stop_cmd_windows =
+            Windows:
+                copy_curl = curl.exe
         - ftp:
             target_port = 21
             service_linux = vsftpd
@@ -75,7 +78,7 @@
                 setup_targets = localhost
             website:
                 access_cmd_linux = curl -L www.redhat.com --connect-timeout 10
-                access_cmd_windows = cd C:\lynx && lynx.exe --dump www.redhat.com
+                access_cmd_windows = cd C:\curl\ && curl.exe -k -L www.redhat.com --connect-timeout 10
             ssh, telnet:
                 only Linux
                 vms = "virt-tests-vm1 virt-tests-vm2"

qemu/tests/openflow_acl_test.py

@@ -328,6 +328,12 @@ def run(test, params, env):
             for script in params.get("copy_scripts").split():
                 script_path = os.path.join(script_dir, script)
                 vm.copy_files_to(script_path, tmp_dir)
+        if params.get("os_type") == "windows":
+            curl_win_path = params.get("curl_win_path", "C:\\curl\\")
+            session.cmd("dir {0} || mkdir {0}".format(curl_win_path))
+            for script in params.get("copy_curl").split():
+                curl_win_link = os.path.join(data_dir.get_deps_dir("curl"), script)
+                vm.copy_files_to(curl_win_link, curl_win_path, timeout=60)
         session.close()
 
     vms_tags = params.objects("vms")