Merge pull request #2195 from kimi1978wy/1737720

virtual_nic_stress: fix "HTTP Error 404: Not Found for linux guest"
avocado-framework · Aug 19, 2019 · 31f4ce2 · 31f4ce2
2 parents 0a2da01 + 1187abd
commit 31f4ce2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/shared/cfg/base.cfg b/shared/cfg/base.cfg
@@ -699,7 +699,7 @@ Linux:
     stress_install_from_repo = "no"
     # param for stress tests
     stress_args = '--cpu 4 --io 4 --vm 2 --vm-bytes 256M'
-    download_url_stress = 'http://people.seas.harvard.edu/~apw/stress/stress-1.0.4.tar.gz'
+    download_url_stress = 'stress/stress-1.0.4.tar.gz'
 
     # param to enable/disable sosreport for guest
     enable_guest_sosreport = "no"

diff --git a/shared/deps/stress/stress-1.0.4.tar.gz b/shared/deps/stress/stress-1.0.4.tar.gz
diff --git a/virttest/utils_test/__init__.py b/virttest/utils_test/__init__.py
@@ -2089,6 +2089,8 @@ def __init__(self, stress_type, params, download_url="", make_cmds="",
             "stress_install_from_repo") == "yes"
         self.download_url = self.params.get('download_url_%s' % stress_type,
                                             download_url)
+        if not aurl.is_url(self.download_url) and not os.path.isabs(self.download_url):
+            self.download_url = utils_misc.get_path(data_dir.DEPS_DIR, self.download_url)
         self.download_type = self.params.get('download_type_%s' % stress_type,
                                              download_type)
         self.base_name = self.download_url.split("/")[-1]