summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShubhendu Tripathi <shtripat@redhat.com>2014-04-10 16:37:20 +0530
committerBala.FA <barumuga@redhat.com>2014-04-28 16:20:46 +0530
commitfc90d056a6840739dd774954afbdf2d82375e858 (patch)
tree9fc8812c543609336106fbdb719d3983489f3590
parentb6c5c9910ca136b5a5e720cdbabf8dd0a5ef6cd7 (diff)
gluster-nagios-common: Added test cases to make file
Added test cases test_glustercli and test_storage to the make file Change-Id: Ia75c7abbad565ee505ccb150b1806246ba81eedb Signed-off-by: Shubhendu Tripathi <shtripat@redhat.com>
-rw-r--r--tests/Makefile.am2
-rw-r--r--tests/test_storage.py9
2 files changed, 6 insertions, 5 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index faecae3..9fc74b0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -19,6 +19,8 @@
#
test_modules = \
+ test_glustercli.py \
+ test_storage.py \
utilsTests.py \
$(NULL)
diff --git a/tests/test_storage.py b/tests/test_storage.py
index 3a15cf1..33c1389 100644
--- a/tests/test_storage.py
+++ b/tests/test_storage.py
@@ -21,7 +21,6 @@
import mock
from testrunner import GlusterNagiosTestCase as TestCaseBase
-from glusternagios import storage
import glusternagios
@@ -382,10 +381,10 @@ class TestStorageUtils(TestCaseBase):
'LVM2_PV_NAME': '/dev/vda2',
'LVM2_VG_NAME': 'vg_shubhnd'}}
disk = glusternagios.storage.getDisksForBrick("server-1:"
- "/tmp/vol1-a")
+ "/tmp/vol1-a")
self.assertEquals(disk, "/dev/vda2")
- disk = glusternagios.storage.getDisksForBrick(
- "server-1:/tmp/vol1-a",
- "/dev/mapper/vg_shubhnd-lv_root")
+ disk = glusternagios.storage.getDisksForBrick("server-1:/tmp/vol1-a",
+ "/dev/mapper/"
+ "vg_shubhnd-lv_root")
self.assertEquals(disk, "/dev/vda2")