Merge "Follow redirects by path_or_url preprocessor validation"

openstack · Feb 20, 2020 · 2b2235f · 2b2235f
2 parents ca0f985 + fe84cbe
commit 2b2235f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -36,6 +36,8 @@ Changed
 * `docker image <https://hub.docker.com/r/xrally/xrally>`_ is switched to use
   python3.6.
 
+* *path_or_url* plugin follows redirects while validating urls now.
+
 Fixed
 ~~~~~
 

diff --git a/rally/plugins/common/types.py b/rally/plugins/common/types.py
@@ -30,7 +30,7 @@ def pre_process(self, resource_spec, config):
         if os.path.isfile(path):
             return path
         try:
-            head = requests.head(path, verify=False)
+            head = requests.head(path, verify=False, allow_redirects=True)
             if head.status_code == 200:
                 return path
             raise exceptions.InvalidScenarioArgument(

diff --git a/tests/unit/plugins/common/test_types.py b/tests/unit/plugins/common/test_types.py
@@ -37,7 +37,8 @@ def test_preprocess_bogus(self, mock_requests_head, mock_isfile):
         self.assertRaises(exceptions.InvalidScenarioArgument,
                           types.PathOrUrl({}, {}).pre_process,
                           "fake_path", {})
-        mock_requests_head.assert_called_once_with("fake_path", verify=False)
+        mock_requests_head.assert_called_once_with(
+            "fake_path", verify=False, allow_redirects=True)
 
     @mock.patch("os.path.isfile")
     @mock.patch("requests.head")