summaryrefslogtreecommitdiff
path: root/trove/tests/unittests
diff options
context:
space:
mode:
Diffstat (limited to 'trove/tests/unittests')
-rw-r--r--trove/tests/unittests/common/test_context.py12
-rw-r--r--trove/tests/unittests/common/test_wsgi.py2
-rw-r--r--trove/tests/unittests/extensions/common/test_service.py12
-rw-r--r--trove/tests/unittests/taskmanager/test_models.py10
4 files changed, 18 insertions, 18 deletions
diff --git a/trove/tests/unittests/common/test_context.py b/trove/tests/unittests/common/test_context.py
index a5f2f3a2..16df1f6b 100644
--- a/trove/tests/unittests/common/test_context.py
+++ b/trove/tests/unittests/common/test_context.py
@@ -24,7 +24,7 @@ from trove.tests.unittests import trove_testtools
class TestTroveContext(trove_testtools.TestCase):
def test_create_with_extended_args(self):
expected_service_catalog = {'key': 'value'}
- ctx = context.TroveContext(user="test_user_id",
+ ctx = context.TroveContext(user_id="test_user_id",
request_id="test_req_id",
limit="500",
marker="x",
@@ -34,23 +34,23 @@ class TestTroveContext(trove_testtools.TestCase):
self.assertThat(ctx.service_catalog, Equals(expected_service_catalog))
def test_create(self):
- ctx = context.TroveContext(user='test_user_id',
+ ctx = context.TroveContext(user_id='test_user_id',
request_id='test_req_id')
- self.assertThat(ctx.user, Equals('test_user_id'))
+ self.assertThat(ctx.user_id, Equals('test_user_id'))
self.assertThat(ctx.request_id, Equals('test_req_id'))
self.assertThat(ctx.limit, Is(None))
self.assertThat(ctx.marker, Is(None))
self.assertThat(ctx.service_catalog, Is(None))
def test_to_dict(self):
- ctx = context.TroveContext(user='test_user_id',
+ ctx = context.TroveContext(user_id='test_user_id',
request_id='test_req_id')
ctx_dict = ctx.to_dict()
self.assertThat(ctx_dict.get('user'), Equals('test_user_id'))
self.assertThat(ctx_dict.get('request_id'), Equals('test_req_id'))
def test_to_dict_with_notification(self):
- ctx = context.TroveContext(user='test_user_id',
+ ctx = context.TroveContext(user_id='test_user_id',
project_id='the_tenant',
request_id='test_req_id')
ctx.notification = DBaaSInstanceCreate(ctx,
@@ -70,7 +70,7 @@ class TestTroveContext(trove_testtools.TestCase):
'request_id': 'test_req_id',
'project_id': 'abc',
'blah_blah': 'blah blah'})
- self.assertThat(ctx.user, Equals('test_user_id'))
+ self.assertThat(ctx.user_id, Equals('test_user_id'))
self.assertThat(ctx.request_id, Equals('test_req_id'))
self.assertThat(ctx.project_id, Equals('abc'))
self.assertThat(ctx.limit, Is(None))
diff --git a/trove/tests/unittests/common/test_wsgi.py b/trove/tests/unittests/common/test_wsgi.py
index 324078da..9297fed6 100644
--- a/trove/tests/unittests/common/test_wsgi.py
+++ b/trove/tests/unittests/common/test_wsgi.py
@@ -42,7 +42,7 @@ class TestWsgi(trove_testtools.TestCase):
# assertions
ctx = req.environ[wsgi.CONTEXT_KEY]
self.assertThat(ctx, Not(Is(None)))
- self.assertThat(ctx.user, Equals(user_id))
+ self.assertThat(ctx.user_id, Equals(user_id))
self.assertThat(ctx.auth_token, Equals(token))
self.assertEqual(0, len(ctx.service_catalog))
diff --git a/trove/tests/unittests/extensions/common/test_service.py b/trove/tests/unittests/extensions/common/test_service.py
index ecb61f21..2eddc2db 100644
--- a/trove/tests/unittests/extensions/common/test_service.py
+++ b/trove/tests/unittests/extensions/common/test_service.py
@@ -61,8 +61,8 @@ class TestDefaultRootController(trove_testtools.TestCase):
def test_root_create(self, root_create):
user = Mock()
context = Mock()
- context.user = Mock()
- context.user.__getitem__ = Mock(return_value=user)
+ context.user_id = Mock()
+ context.user_id.__getitem__ = Mock(return_value=user)
req = Mock()
req.environ = Mock()
req.environ.__getitem__ = Mock(return_value=context)
@@ -376,8 +376,8 @@ class TestClusterRootController(trove_testtools.TestCase):
@patch.object(models.ClusterRoot, "create")
def test_instance_root_create(self, mock_cluster_root_create):
user = Mock()
- self.context.user = Mock()
- self.context.user.__getitem__ = Mock(return_value=user)
+ self.context.user_id = Mock()
+ self.context.user_id.__getitem__ = Mock(return_value=user)
req = Mock()
req.environ = {'trove.context': self.context}
password = Mock()
@@ -393,8 +393,8 @@ class TestClusterRootController(trove_testtools.TestCase):
@patch.object(models.ClusterRoot, "create")
def test_instance_root_create_no_body(self, mock_cluster_root_create):
user = Mock()
- self.context.user = Mock()
- self.context.user.__getitem__ = Mock(return_value=user)
+ self.context.user_id = Mock()
+ self.context.user_id.__getitem__ = Mock(return_value=user)
req = Mock()
req.environ = {'trove.context': self.context}
password = None
diff --git a/trove/tests/unittests/taskmanager/test_models.py b/trove/tests/unittests/taskmanager/test_models.py
index 3eb81b8c..4eff71a3 100644
--- a/trove/tests/unittests/taskmanager/test_models.py
+++ b/trove/tests/unittests/taskmanager/test_models.py
@@ -221,7 +221,7 @@ class BaseFreshInstanceTasksTest(trove_testtools.TestCase):
self.freshinstancetasks = taskmanager_models.FreshInstanceTasks(
None, MagicMock(), None, None)
self.freshinstancetasks.context = trove.common.context.TroveContext(
- user='test_user')
+ user_id='test_user')
def tearDown(self):
super(BaseFreshInstanceTasksTest, self).tearDown()
@@ -1195,16 +1195,16 @@ class RootReportTest(trove_testtools.TestCase):
def test_report_root_first_time(self):
context = Mock()
- context.user = utils.generate_uuid()
+ context.user_id = utils.generate_uuid()
report = mysql_models.RootHistory.create(
context, utils.generate_uuid())
self.assertIsNotNone(report)
def test_report_root_double_create(self):
context = Mock()
- context.user = utils.generate_uuid()
+ context.user_id = utils.generate_uuid()
id = utils.generate_uuid()
- history = mysql_models.RootHistory(id, context.user).save()
+ history = mysql_models.RootHistory(id, context.user_id).save()
with patch.object(mysql_models.RootHistory, 'load',
Mock(return_value=history)):
report = mysql_models.RootHistory.create(context, id)
@@ -1219,7 +1219,7 @@ class ClusterRootTest(trove_testtools.TestCase):
@patch.object(common_models.Root, "create")
def test_cluster_root_create(self, root_create, root_history_create):
context = Mock()
- context.user = utils.generate_uuid()
+ context.user_id = utils.generate_uuid()
id = utils.generate_uuid()
password = "rootpassword"
cluster_instances = [utils.generate_uuid(), utils.generate_uuid()]
View Lorry Controller Status