fix(lock): fix broken test

Signed-off-by: Chris Snow <[email protected]>

Author: snowch

hpecp/cli/lock.py

@@ -75,12 +75,12 @@ def create(self, reason, timeout_secs=300):
         response = base.get_client().lock.create(reason, timeout_secs)
         if response is False:
             print(
-                "Unabled to lock within '{}'".format(timeout_secs),
+                "Unable to lock within '{}'".format(timeout_secs),
                 file=sys.stderr,
             )
         else:
             # reponse contains lock ID
-            print(response, file=sys.stderr)
+            print(response, file=sys.stdout)
 
     @base.intercept_exception
     def delete(

hpecp/lock.py

@@ -66,10 +66,10 @@ def create(self, reason=None, timeout_secs=300):
             data=data,
             description="lock/set_lock",
         )
-        id = CaseInsensitiveDict(response.headers)["Location"]
+        lock_id = CaseInsensitiveDict(response.headers)["Location"]
 
         if timeout_secs == 0:
-            return id
+            return lock_id
         else:
             try:
                 polling.poll(
@@ -78,7 +78,7 @@ def create(self, reason=None, timeout_secs=300):
                     poll_forever=False,
                     timeout=timeout_secs,
                 )
-                return id
+                return lock_id
             except polling.TimeoutException:
                 return False
 

tests/lock_test.py

@@ -204,8 +204,25 @@ def test_delete_all_timeout(self, mock_get, mock_post, mock_delete):
 
 
 class TestCLICreate(BaseTestCase):
+    def mocked_requests_get_locked(*args, **kwargs):
+        if args[0] == "https://127.0.0.1:8080/api/v1/lock":
+            return MockResponse(
+                json_data={
+                    "_links": {"self": {"href": "/api/v1/lock"}},
+                    "locked": True,
+                    "_embedded": {
+                        "internal_locks": ["1"],
+                        "external_locks": [],
+                    },
+                },
+                status_code=200,
+                headers=dict(),
+            )
+        raise RuntimeError("Unhandle GET request: " + args[0])
+
     @patch("requests.post", side_effect=BaseTestCase.httpPostHandlers)
-    def test_create(self, mock_post):
+    @patch("requests.get", side_effect=mocked_requests_get_locked)
+    def test_create(self, mock_post, mock_get):
 
         try:
             hpecp = self.cli.CLI()
@@ -220,7 +237,11 @@ def test_create(self, mock_post):
         expected_stdout = "/test_location/1"
         expected_stderr = ""
 
-        self.assertEqual(stdout, expected_stdout)
+        self.assertEqual(
+            stdout,
+            expected_stdout,
+            "Expected: '{}' Actual: '{}'".format(expected_stdout, stdout),
+        )
 
         # coverage seems to populate standard error on PY3 (issues 93)
         if six.PY2: