Merge pull request #542 from sudorandom/issue-541

sudorandom · sudorandom · commit ba7e9567037b · 2015-05-04T21:53:31.000-05:00
Fixes bug when prompting users for confirmation
diff --git a/SoftLayer/CLI/formatting.py b/SoftLayer/CLI/formatting.py
@@ -192,8 +192,8 @@ def no_going_back(confirmation):
     prompt = ('This action cannot be undone! Type "%s" or press Enter '
               'to abort' % confirmation)
 
-    ans = click.confirm(prompt, default='', show_default=False).lower()
-    if ans == str(confirmation):
+    ans = click.prompt(prompt, default='', show_default=False)
+    if ans.lower() == str(confirmation):
         return True
 
     return False
diff --git a/SoftLayer/managers/messaging.py b/SoftLayer/managers/messaging.py
@@ -168,7 +168,12 @@ def _make_request(self, method, path, **kwargs):
 
         url = '/'.join((self.endpoint, 'v1', self.account_id, path))
         resp = requests.request(method, url, **kwargs)
-        resp.raise_for_status()
+        try:
+            resp.raise_for_status()
+        except requests.HTTPError as ex:
+            content = json.loads(ex.response.content)
+            raise exceptions.SoftLayerAPIError(ex.response.status_code,
+                                               content['message'])
         return resp
 
     def authenticate(self, username, api_key, auth_token=None):
diff --git a/SoftLayer/tests/CLI/helper_tests.py b/SoftLayer/tests/CLI/helper_tests.py
@@ -41,21 +41,21 @@ def test_fail(self):
 
 class PromptTests(testing.TestCase):
 
-    @mock.patch('click.confirm')
-    def test_do_or_die(self, confirm_mock):
+    @mock.patch('click.prompt')
+    def test_do_or_die(self, prompt_mock):
         confirmed = '37347373737'
-        confirm_mock.return_value = confirmed
+        prompt_mock.return_value = confirmed
         result = formatting.no_going_back(confirmed)
         self.assertTrue(result)
 
         # no_going_back should cast int's to str()
         confirmed = '4712309182309'
-        confirm_mock.return_value = confirmed
+        prompt_mock.return_value = confirmed
         result = formatting.no_going_back(int(confirmed))
         self.assertTrue(result)
 
         confirmed = None
-        confirm_mock.return_value = ''
+        prompt_mock.return_value = ''
         result = formatting.no_going_back(confirmed)
         self.assertFalse(result)
 
