diff options
| author | Steve Baker <sbaker@redhat.com> | 2020-01-27 12:39:15 +1300 |
|---|---|---|
| committer | Steve Baker <sbaker@redhat.com> | 2020-05-06 11:20:52 +1200 |
| commit | a83dfd5b983d5276a53a40713b2186bb8d78f7ec (patch) | |
| tree | 12e18597a5610d29df051195dc11d48f770aa140 /ironic/tests/unit/api/controllers/v1/test_utils.py | |
| parent | c647408f8d4a15e7ee3f88e1929bc64fd68f3cec (diff) | |
| download | ironic-a83dfd5b983d5276a53a40713b2186bb8d78f7ec.tar.gz | |
Do all serialization in the expose decorator
Instead of delegating to the @wsme.wsexpose decorator, bring the
required logic into this decorator, including a mimimum required
tojson function.
Change-Id: I96661570d77ecb641b4ac7508e65bd7ca83194a5
Story: 1651346
Diffstat (limited to 'ironic/tests/unit/api/controllers/v1/test_utils.py')
| -rw-r--r-- | ironic/tests/unit/api/controllers/v1/test_utils.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ironic/tests/unit/api/controllers/v1/test_utils.py b/ironic/tests/unit/api/controllers/v1/test_utils.py index 3defca326..e33617d74 100644 --- a/ironic/tests/unit/api/controllers/v1/test_utils.py +++ b/ironic/tests/unit/api/controllers/v1/test_utils.py @@ -21,7 +21,6 @@ import os_traits from oslo_config import cfg from oslo_utils import uuidutils from webob import static -import wsme from ironic import api from ironic.api.controllers.v1 import node as api_node @@ -692,7 +691,7 @@ class TestVendorPassthru(base.TestCase): passthru_mock.assert_called_once_with( 'fake-context', 'fake-ident', 'squarepants', 'POST', 'fake-data', 'fake-topic') - self.assertIsInstance(response, wsme.api.Response) + self.assertIsInstance(response, atypes.Response) self.assertEqual('SpongeBob', response.obj) self.assertEqual(response.return_type, atypes.Unset) sc = http_client.ACCEPTED if async_call else http_client.OK @@ -731,7 +730,7 @@ class TestVendorPassthru(base.TestCase): self.assertEqual(expct_return_value, mock_response.app_iter.file.read()) # Assert response message is none - self.assertIsInstance(response, wsme.api.Response) + self.assertIsInstance(response, atypes.Response) self.assertIsNone(response.obj) self.assertIsNone(response.return_type) self.assertEqual(http_client.OK, response.status_code) |