summaryrefslogtreecommitdiff
path: root/ceilometerclient/tests/unit
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-19 00:03:21 +0000
committerGerrit Code Review <review@openstack.org>2016-01-19 00:03:21 +0000
commit500e6129aee983cacaacbd48d0a706323e54bc71 (patch)
tree12363c237d00b040a9af4c33955f1c79ac87fd1a /ceilometerclient/tests/unit
parent5b37a18b9c43e22e5116879aeceee808bf435422 (diff)
parente93aed197a0627e351f422ae7a93b65b4862181c (diff)
downloadpython-ceilometerclient-500e6129aee983cacaacbd48d0a706323e54bc71.tar.gz
Merge "Fix to disable meter-links from CLI"
Diffstat (limited to 'ceilometerclient/tests/unit')
-rw-r--r--ceilometerclient/tests/unit/v2/test_shell.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/ceilometerclient/tests/unit/v2/test_shell.py b/ceilometerclient/tests/unit/v2/test_shell.py
index ff092c5..053936b 100644
--- a/ceilometerclient/tests/unit/v2/test_shell.py
+++ b/ceilometerclient/tests/unit/v2/test_shell.py
@@ -1885,10 +1885,8 @@ class ShellResourceListCommandTest(utils.BaseTestCase):
def test_resource_list(self):
resource = resources.Resource(mock.Mock(), self.RESOURCE)
self.cc.resources.list.return_value = [resource]
-
ceilometer_shell.do_resource_list(self.cc, self.args)
self.cc.resources.list.assert_called_once_with(q=[],
- links=None,
limit=None)
self.assertEqual('''\
@@ -1901,12 +1899,10 @@ class ShellResourceListCommandTest(utils.BaseTestCase):
@mock.patch('sys.stdout', new=six.StringIO())
def test_resource_list_with_links(self):
- self.args.meter_links = True
resource = resources.Resource(mock.Mock(), self.RESOURCE)
self.cc.resources.list.return_value = [resource]
ceilometer_shell.do_resource_list(self.cc, self.args)
self.cc.resources.list.assert_called_once_with(q=[],
- links=True,
limit=None)
self.assertEqual('''\
+-------------+-----------+---------+------------+