From fc90d056a6840739dd774954afbdf2d82375e858 Mon Sep 17 00:00:00 2001 From: Shubhendu Tripathi Date: Thu, 10 Apr 2014 16:37:20 +0530 Subject: 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 --- tests/Makefile.am | 2 ++ tests/test_storage.py | 9 ++++----- 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") -- cgit