summaryrefslogtreecommitdiffstats
path: root/tests/test_swap_dataFile.py
diff options
context:
space:
mode:
authorndarshan <dnarayan@redhat.com>2014-04-21 12:19:06 +0530
committerSahina Bose <sabose@redhat.com>2014-05-08 01:49:08 -0700
commite96918e80ce059ed3dbd2099db00eee8c120809f (patch)
treed74babe69a768969e9ad15d7171bf39e0500a0d2 /tests/test_swap_dataFile.py
parentb87f9527515f27f145cc6b5cff1e68bab5cf2b21 (diff)
rhs-addons:Fix: Modified swap and memory plugin to show in GB.
Modified swap and memory plugin to show message and performance data in GB instead of kB. https://bugzilla.redhat.com/show_bug.cgi?id=1080004 Signed-off-by: ndarshan <dnarayan@redhat.com> Change-Id: I06cfd4cd8e19ac8bc21c50ee0f37f15b4ae8cc2e Reviewed-on: http://review.gluster.org/7640 Reviewed-by: Sahina Bose <sabose@redhat.com>
Diffstat (limited to 'tests/test_swap_dataFile.py')
-rw-r--r--tests/test_swap_dataFile.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/test_swap_dataFile.py b/tests/test_swap_dataFile.py
index 58ebaf3..0aff285 100644
--- a/tests/test_swap_dataFile.py
+++ b/tests/test_swap_dataFile.py
@@ -33,8 +33,8 @@ SHOW_SWAP_STATUS_OK_IP = \
'unit': 'kB'}}
SHOW_SWAP_STATUS_OK_OP = \
- {'message': "OK- 0.00% used(0kB out of 20971516kB)|"
- "Used=0kB;10485758;16777212;0;20971516", 'exit_status': 0}
+ {'message': "OK- 0.00% used(0.00GB out of 20.00GB)|"
+ "Used=0.00GB;10.00;16.00;0;20.00", 'exit_status': 0}
SHOW_SWAP_STATUS_WARNING_IP = \
{'date': '2014-03-10',
@@ -47,9 +47,9 @@ SHOW_SWAP_STATUS_WARNING_IP = \
'unit': 'kB'}}
SHOW_SWAP_STATUS_WARNING_OP = \
- {'message': "WARNING- 50.00% used(10485758kB"
- " out of 20971516kB)|Used=10485758kB;8388606;"
- "12582909;0;20971516", 'exit_status': 1}
+ {'message': "WARNING- 50.00% used(10.00GB out "
+ "of 20.00GB)|Used=10.00GB;8.00;12.00;0;20.00",
+ 'exit_status': 1}
SHOW_SWAP_STATUS_CRITICAL_IP = \
{'date': '2014-03-10',
@@ -62,9 +62,9 @@ SHOW_SWAP_STATUS_CRITICAL_IP = \
'unit': 'kB'}}
SHOW_SWAP_STATUS_CRITICAL_OP = \
- {'message': "CRITICAL- 50.00% used(10485758kB out"
- " of 20971516kB)|Used=10485758kB;6291454;8388606"
- ";0;20971516", 'exit_status': 2}
+ {'message': "CRITICAL- 50.00% used(10.00GB out "
+ "of 20.00GB)|Used=10.00GB;6.00;8.00;0;20.00",
+ 'exit_status': 2}
SHOW_SWAP_STATUS_EXCEPTION_IP = \
{'date': '2014-03-10',