From ccec0742af257e13effafa30a1184541c3cf5b65 Mon Sep 17 00:00:00 2001 From: Kanagaraj M Date: Wed, 30 Apr 2014 19:52:24 +0530 Subject: vol-status: remove volume-info from status When Volume is in OK state, volume info will not be sent along with status. Change-Id: I3b3644c45676c35f7b7dec048531a40b3de2fb8d Signed-off-by: Kanagaraj M Reviewed-on: http://review.gluster.org/7612 Reviewed-by: Ramesh N Reviewed-by: Sahina Bose --- tests/test_check_volume_status.py | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'tests') diff --git a/tests/test_check_volume_status.py b/tests/test_check_volume_status.py index ce7803e..4d4f940 100644 --- a/tests/test_check_volume_status.py +++ b/tests/test_check_volume_status.py @@ -17,7 +17,6 @@ # # Refer to the README and COPYING files for full details of the license # -import json import mock from testrunner import PluginsTestCase as TestCaseBase @@ -43,8 +42,7 @@ class TestCheckVolumeStatus(TestCaseBase): exitStatusCode, exitStatusMsg = (check_volume_status .getVolumeStatus(args)) print exitStatusMsg - print _expectedVolume() - assert exitStatusMsg == ("OK: Volume is up \n%s" % _expectedVolume()) + assert exitStatusMsg == "OK: Volume is up" assert exitStatusCode == utils.PluginStatusCode.OK # Method to test volume status when no volume @@ -101,18 +99,6 @@ def _getVolume(): return vol -def _expectedVolume(): - vol = {'test-vol': {'brickCount': 2, - 'bricks': ['server1:/path1', 'server2:/path2'], - 'options': {}, - 'transportType': ['tcp'], - 'uuid': '0000-0000-0000-1111', - 'volumeName': 'test-vol', - 'volumeStatus': 'ONLINE', - 'volumeType': 'DISTRIBUTED'}} - return json.dumps(vol) - - def _getEmptyVolume(): return {} -- cgit