summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChetan Risbud <crisbud@redhat.com>2013-10-04 15:47:47 +0530
committerLuis Pabon <lpabon@redhat.com>2013-10-21 19:10:59 -0700
commit11e2be75faa5af4f5c724c61447559693cd05b7f (patch)
tree76281dd07cfbf348124c82d0f4f56f2455f02934
parentcadaed4627078581eddf85ce2b86555f5efec1bd (diff)
Unit test coverage for Fake_file interfaces
The modified test case provides the complete coverage over Fake_file class. These interfaces are to be used for directory type of the objects. BUG:987841 https://bugzilla.redhat.com/show_bug.cgi?id=987841 Change-Id: I2401423d2013ce7d90c454c72fbb60f4bc05ceb1 Signed-off-by: Chetan Risbud <crisbud@redhat.com> Reviewed-on: http://review.gluster.org/6037 Reviewed-by: Luis Pabon <lpabon@redhat.com> Tested-by: Luis Pabon <lpabon@redhat.com>
-rw-r--r--test/unit/obj/test_diskfile.py27
1 files changed, 20 insertions, 7 deletions
diff --git a/test/unit/obj/test_diskfile.py b/test/unit/obj/test_diskfile.py
index a9d499e..7475105 100644
--- a/test/unit/obj/test_diskfile.py
+++ b/test/unit/obj/test_diskfile.py
@@ -35,6 +35,7 @@ import gluster.swift.obj.diskfile
from gluster.swift.obj.diskfile import DiskFile
from gluster.swift.common.utils import DEFAULT_UID, DEFAULT_GID, X_TYPE, \
X_OBJECT_TYPE, DIR_OBJECT
+from gluster.swift.common.fs_utils import Fake_file
from test.unit.common.test_utils import _initxattr, _destroyxattr
from test.unit import FakeLogger
@@ -270,7 +271,7 @@ class TestDiskFile(unittest.TestCase):
assert not self.called
assert gdf.fp is None
- def test_close_dir_object(self):
+ def test_all_dir_object(self):
the_cont = os.path.join(self.td, "vol0", "bar")
the_dir = "dir"
self.called = False
@@ -278,13 +279,25 @@ class TestDiskFile(unittest.TestCase):
gdf = self._get_diskfile("vol0", "p57", "ufo47", "bar", "dir",
keep_data_fp=True)
- def our_do_close(fp):
- self.called = True
+ ret = isinstance(gdf.fp, Fake_file)
+ self.assertTrue(ret)
+
+ # Get a File descriptor
+ fd = gdf.fp
+
+ # This expected to call Fake_file interfaces
+ ret = fd.tell()
+ self.assertEqual(ret , 0)
+
+ ret = fd.read(1)
+ self.assertEqual(ret , 0)
+
+ ret = fd.fileno()
+ self.assertEqual(ret, -1)
+
+ ret = fd.close()
+ self.assertFalse(self.called)
- with mock.patch("gluster.swift.obj.diskfile.do_close",
- our_do_close):
- gdf.close()
- assert self.called
def test_close_file_object(self):
the_cont = os.path.join(self.td, "vol0", "bar")