Reorg unit tests for API
This patch reorganizes the unit tests for senlin API. The directory layout mimics that of the modules to be tested. This makes room for future patches where we are adding new version of APIs etc. Change-Id: Ifc544a8fd6b7245da99bc5229f20a57962405198
This commit is contained in:
parent
8d4bc49bb0
commit
05667bb472
|
@ -227,7 +227,7 @@ class FaultMiddlewareTest(base.SenlinTestCase):
|
|||
exc_info = (type(error), error, None)
|
||||
serialized = rpc_common.serialize_remote_exception(exc_info)
|
||||
remote_error = rpc_common.deserialize_remote_exception(
|
||||
serialized, ["senlin.tests.unit.middleware.test_fault_middleware"])
|
||||
serialized, ["senlin.tests.unit.api.middleware.test_fault"])
|
||||
|
||||
wrapper = fault.FaultWrapper(None)
|
||||
msg = wrapper._error(remote_error)
|
|
@ -19,7 +19,7 @@ from senlin.api.openstack.v1 import actions
|
|||
from senlin.common import exception as senlin_exc
|
||||
from senlin.common import policy
|
||||
from senlin.rpc import client as rpc_client
|
||||
from senlin.tests.unit.apiv1 import shared
|
||||
from senlin.tests.unit.api import shared
|
||||
from senlin.tests.unit.common import base
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ from senlin.api.middleware import fault
|
|||
from senlin.api.openstack.v1 import build_info
|
||||
from senlin.common import policy
|
||||
from senlin.rpc import client as rpc_client
|
||||
from senlin.tests.unit.apiv1 import shared
|
||||
from senlin.tests.unit.api import shared
|
||||
from senlin.tests.unit.common import base
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ from senlin.api.openstack.v1 import cluster_policies as cp_mod
|
|||
from senlin.common import exception as senlin_exc
|
||||
from senlin.common import policy
|
||||
from senlin.rpc import client as rpc_client
|
||||
from senlin.tests.unit.apiv1 import shared
|
||||
from senlin.tests.unit.api import shared
|
||||
from senlin.tests.unit.common import base
|
||||
|
||||
|
|
@ -24,7 +24,7 @@ from senlin.common import exception as senlin_exc
|
|||
from senlin.common.i18n import _
|
||||
from senlin.common import policy
|
||||
from senlin.rpc import client as rpc_client
|
||||
from senlin.tests.unit.apiv1 import shared
|
||||
from senlin.tests.unit.api import shared
|
||||
from senlin.tests.unit.common import base
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ from senlin.api.openstack.v1 import events
|
|||
from senlin.common import exception as senlin_exc
|
||||
from senlin.common import policy
|
||||
from senlin.rpc import client as rpc_client
|
||||
from senlin.tests.unit.apiv1 import shared
|
||||
from senlin.tests.unit.api import shared
|
||||
from senlin.tests.unit.common import base
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ from senlin.api.openstack.v1 import nodes
|
|||
from senlin.common import exception as senlin_exc
|
||||
from senlin.common import policy
|
||||
from senlin.rpc import client as rpc_client
|
||||
from senlin.tests.unit.apiv1 import shared
|
||||
from senlin.tests.unit.api import shared
|
||||
from senlin.tests.unit.common import base
|
||||
|
||||
|
|
@ -23,7 +23,7 @@ from senlin.common import exception as senlin_exc
|
|||
from senlin.common.i18n import _
|
||||
from senlin.common import policy
|
||||
from senlin.rpc import client as rpc_client
|
||||
from senlin.tests.unit.apiv1 import shared
|
||||
from senlin.tests.unit.api import shared
|
||||
from senlin.tests.unit.common import base
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ from senlin.api.openstack.v1 import policy_types
|
|||
from senlin.common import exception as senlin_exc
|
||||
from senlin.common import policy
|
||||
from senlin.rpc import client as rpc_client
|
||||
from senlin.tests.unit.apiv1 import shared
|
||||
from senlin.tests.unit.api import shared
|
||||
from senlin.tests.unit.common import base
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ from senlin.api.openstack.v1 import profile_types
|
|||
from senlin.common import exception as senlin_exc
|
||||
from senlin.common import policy
|
||||
from senlin.rpc import client as rpc_client
|
||||
from senlin.tests.unit.apiv1 import shared
|
||||
from senlin.tests.unit.api import shared
|
||||
from senlin.tests.unit.common import base
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ from senlin.api.openstack.v1 import profiles
|
|||
from senlin.common import exception as senlin_exc
|
||||
from senlin.common import policy
|
||||
from senlin.rpc import client as rpc_client
|
||||
from senlin.tests.unit.apiv1 import shared
|
||||
from senlin.tests.unit.api import shared
|
||||
from senlin.tests.unit.common import base
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ from senlin.common import exception as senlin_exc
|
|||
from senlin.common.i18n import _
|
||||
from senlin.common import policy
|
||||
from senlin.rpc import client as rpc_client
|
||||
from senlin.tests.unit.apiv1 import shared
|
||||
from senlin.tests.unit.api import shared
|
||||
from senlin.tests.unit.common import base
|
||||
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
# under the License.
|
||||
|
||||
from senlin.api.openstack.v1 import version
|
||||
from senlin.tests.unit.apiv1 import shared
|
||||
from senlin.tests.unit.api import shared
|
||||
from senlin.tests.unit.common import base
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ from oslo_serialization import jsonutils
|
|||
from senlin.api.openstack.v1 import webhooks
|
||||
from senlin.common import policy
|
||||
from senlin.rpc import client as rpc_client
|
||||
from senlin.tests.unit.apiv1 import shared
|
||||
from senlin.tests.unit.api import shared
|
||||
from senlin.tests.unit.common import base
|
||||
|
||||
|
|
@ -83,9 +83,6 @@ class ControllerTest(object):
|
|||
def _delete(self, path):
|
||||
return self._simple_request(path, method='DELETE')
|
||||
|
||||
def _abandon(self, path):
|
||||
return self._simple_request(path, method='DELETE')
|
||||
|
||||
def _data_request(self, path, data, content_type='application/json',
|
||||
method='POST'):
|
||||
environ = self._environ(path)
|
Loading…
Reference in New Issue