summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-07-02 21:34:28 +0000
committerGerrit Code Review <review@openstack.org>2013-07-02 21:34:28 +0000
commitdfe30fbe2d530b435149b3fbe26984a196d5f807 (patch)
tree68a64ae985f0148186d01fe351e2bf6c0dfd33ea
parentd07c96be36804ba52ad7eb8cf3b9fc3eb1a52619 (diff)
parentaa9185bc7b1d88ceee117534e3e7004189f1b168 (diff)
downloadoslo-context-dfe30fbe2d530b435149b3fbe26984a196d5f807.tar.gz
Merge "Fix bad default for show_deleted"
-rw-r--r--openstack/common/context.py2
-rw-r--r--tests/unit/test_context.py4
2 files changed, 5 insertions, 1 deletions
diff --git a/openstack/common/context.py b/openstack/common/context.py
index 3899c2c..81772bc 100644
--- a/openstack/common/context.py
+++ b/openstack/common/context.py
@@ -61,7 +61,7 @@ class RequestContext(object):
'request_id': self.request_id}
-def get_admin_context(show_deleted="no"):
+def get_admin_context(show_deleted=False):
context = RequestContext(None,
tenant=None,
is_admin=True,
diff --git a/tests/unit/test_context.py b/tests/unit/test_context.py
index 0db7aaa..2f9a3de 100644
--- a/tests/unit/test_context.py
+++ b/tests/unit/test_context.py
@@ -24,3 +24,7 @@ class ContextTest(utils.BaseTestCase):
def test_context(self):
ctx = context.RequestContext()
self.assertTrue(ctx)
+
+ def test_admin_context_show_deleted_flag_default(self):
+ ctx = context.get_admin_context()
+ self.assertFalse(ctx.show_deleted)