Merge branch 'master' into dependabot/pip/click-8.4.2

Author: allmightyspiff

tests/CLI/modules/vs/vs_create_tests.py

@@ -382,10 +382,13 @@ def test_create_like(self, confirm_mock):
         }
 
         confirm_mock.return_value = True
+        # Prompts to confirm hostname, domain, and datacenter.
+        stdin = "\n\n\n"
         result = self.run_command(['vs', 'create',
                                    '--like=123',
                                    '--san',
-                                   '--billing=hourly'])
+                                   '--billing=hourly'],
+                                  stdin=stdin)
 
         self.assert_no_fail(result)
         self.assertIn('"guid": "1a2b3c-1701"', result.output)
@@ -426,10 +429,13 @@ def test_create_like_tags(self, confirm_mock):
         }
 
         confirm_mock.return_value = True
+        # Prompts to confirm hostname, domain, and datacenter.
+        stdin = "\n\n\n"
         result = self.run_command(['vs', 'create',
                                    '--like=123',
                                    '--san',
-                                   '--billing=hourly'])
+                                   '--billing=hourly'],
+                                  stdin=stdin)
 
         self.assert_no_fail(result)
         self.assertIn('"guid": "1a2b3c-1701"', result.output)
@@ -457,10 +463,13 @@ def test_create_like_image(self, confirm_mock):
         }
 
         confirm_mock.return_value = True
+        # Prompts to confirm hostname, domain, and datacenter.
+        stdin = "\n\n\n"
         result = self.run_command(['vs', 'create',
                                    '--like=123',
                                    '--san',
-                                   '--billing=hourly'])
+                                   '--billing=hourly'],
+                                  stdin=stdin)
 
         self.assert_no_fail(result)
         self.assertIn('"guid": "1a2b3c-1701"', result.output)
@@ -499,7 +508,9 @@ def test_create_like_flavor(self, confirm_mock):
         }
 
         confirm_mock.return_value = True
-        result = self.run_command(['vs', 'create', '--like=123'])
+        # Prompts to confirm hostname, domain, and datacenter.
+        stdin = "\n\n\n"
+        result = self.run_command(['vs', 'create', '--like=123'], stdin=stdin)
 
         self.assert_no_fail(result)
         self.assertIn('"guid": "1a2b3c-1701"', result.output)
@@ -540,7 +551,9 @@ def test_create_like_transient(self, confirm_mock):
         }
 
         confirm_mock.return_value = True
-        result = self.run_command(['vs', 'create', '--like=123'])
+        # Prompts to confirm hostname, domain, and datacenter.
+        stdin = "\n\n\n"
+        result = self.run_command(['vs', 'create', '--like=123'], stdin=stdin)
 
         self.assert_no_fail(result)
         self.assertIn('"guid": "1a2b3c-1701"', result.output)

tools/requirements.txt

@@ -1,9 +1,9 @@
 
 click == 8.4.2
-requests >= 2.32.5
+requests >= 2.34.2
 prompt_toolkit >= 3.0.52
 pygments >= 2.20.0
-urllib3 >= 2.6.3
+urllib3 >= 2.7.0
 rich == 15.0.0
 # only used for soap transport
 # softlayer-zeep >= 5.0.0

tools/test-requirements.txt

@@ -5,10 +5,10 @@ pytest-cov
 mock
 sphinx
 click == 8.4.2
-requests >= 2.32.5
+requests >= 2.34.2
 prompt_toolkit >= 3.0.52
 pygments >= 2.20.0
-urllib3 >= 2.6.3
+urllib3 >= 2.7.0
 rich >= 12.3.0
 flake8
 autopep8