openstack
/
trove
Code Issues Proposed changes

Merge "Modify unit test to allow cli to merge"

This commit is contained in:
Jenkins 2013-08-29 20:49:50 +00:00 committed by Gerrit Code Review
parent ee496de4e8 cf180e42c1
commit e3b7881ada
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
trove/tests/api/root.py
View File

@ -81,7 +81,11 @@ class TestRoot(object):
"""Test that root is disabled"""
enabled = self.dbaas.root.is_root_enabled(instance_info.id)
assert_equal(200, self.dbaas.last_http_code)
assert_false(enabled, "Root SHOULD NOT be enabled.")
is_enabled = enabled
if hasattr(enabled, 'rootEnabled'):
is_enabled = enabled.rootEnabled
assert_false(is_enabled, "Root SHOULD NOT be enabled.")
@test
def test_create_user_os_admin_failure(self):