Adds better test/implementation for deprecated functionality

sudorandom · sudorandom · commit fc98a2220708 · 2014-09-19T11:36:54.000-05:00
diff --git a/SoftLayer/API.py b/SoftLayer/API.py
@@ -184,14 +184,14 @@ def call(self, service, method, *args, **kwargs):
         }
 
         if self.auth:
-            if getattr(self.auth, "get_headers", None):
-                warnings.warn("auth.get_headers() is deprecation and will be "
+            extra_headers = self.auth.get_headers()
+            if extra_headers:
+                warnings.warn("auth.get_headers() is deprecated and will be "
                               "removed in the next major version",
                               DeprecationWarning)
-                headers.update(self.auth.get_headers())
+                headers.update(extra_headers)
 
-            if getattr(self.auth, "get_options", None):
-                options = self.auth.get_options(options)
+            options = self.auth.get_options(options)
 
         return transports.make_xml_rpc_api_call(uri, method, args,
                                                 **options)
diff --git a/SoftLayer/tests/deprecated_tests.py b/SoftLayer/tests/deprecated_tests.py
@@ -4,6 +4,8 @@
 
     :license: MIT, see LICENSE for more details.
 """
+import warnings
+
 import mock
 
 import SoftLayer
@@ -24,10 +26,18 @@ def set_up(self):
 
     @mock.patch('SoftLayer.transports.make_xml_rpc_api_call')
     def test_simple_call(self, make_xml_rpc_api_call):
-        self.client['SERVICE'].METHOD()
-        make_xml_rpc_api_call.assert_called_with(
-            mock.ANY, mock.ANY, mock.ANY,
-            headers={'deprecated': 'header'},
-            proxy=mock.ANY,
-            timeout=mock.ANY,
-            http_headers=mock.ANY)
+        with warnings.catch_warnings(record=True) as w:
+            # Cause all warnings to always be triggered.
+            warnings.simplefilter("always")
+
+            self.client['SERVICE'].METHOD()
+
+            make_xml_rpc_api_call.assert_called_with(
+                mock.ANY, mock.ANY, mock.ANY,
+                headers={'deprecated': 'header'},
+                proxy=mock.ANY,
+                timeout=mock.ANY,
+                http_headers=mock.ANY)
+            self.assertEqual(len(w), 1)
+            self.assertEqual(w[0].category, DeprecationWarning)
+            self.assertIn("deprecated", str(w[0].message))
