summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrashanth Pai <ppai@redhat.com>2016-03-15 12:41:25 +0530
committerPrashanth Pai <ppai@redhat.com>2016-03-15 12:41:25 +0530
commit8aa845cb8ebc45c76e041e5dded42ec9eaf45424 (patch)
tree089603b0dd936724a338b99a23d0c6b91a36e297
parent1815ad27684435a0612c987b5d6d8893417593f8 (diff)
Re-enable glfs_dup() tests
Change-Id: I96b6f2a501d52d66694e67990d6b65d4eb920fa2 Signed-off-by: Prashanth Pai <ppai@redhat.com>
-rwxr-xr-xgluster/gfapi.py1
-rw-r--r--test/functional/libgfapi-python-tests.py2
-rw-r--r--test/unit/gluster/test_gfapi.py1
3 files changed, 0 insertions, 4 deletions
diff --git a/gluster/gfapi.py b/gluster/gfapi.py
index fa0e1b3..3a344c8 100755
--- a/gluster/gfapi.py
+++ b/gluster/gfapi.py
@@ -93,7 +93,6 @@ class File(object):
raise OSError(err, os.strerror(err))
def dup(self):
- raise LibgfapiException("glfs_dup is currently broken (BZ 1311146)")
dupfd = api.glfs_dup(self.fd)
if not dupfd:
err = ctypes.get_errno()
diff --git a/test/functional/libgfapi-python-tests.py b/test/functional/libgfapi-python-tests.py
index 6840d18..bfd5c50 100644
--- a/test/functional/libgfapi-python-tests.py
+++ b/test/functional/libgfapi-python-tests.py
@@ -20,7 +20,6 @@ from gluster.exceptions import LibgfapiException
from test import get_test_config
from ConfigParser import NoSectionError, NoOptionError
from uuid import uuid4
-from nose import SkipTest
config = get_test_config()
if config:
@@ -228,7 +227,6 @@ class FileOpsTest(unittest.TestCase):
self.fail("Expected a OSError with errno.EEXIST")
def test_write_file_dup_lseek_read(self):
- raise SkipTest("glfs_dup is currently broken (BZ 1311146)")
try:
f = File(self.vol.open("dune", os.O_CREAT | os.O_EXCL | os.O_RDWR))
f.write("I must not fear. Fear is the mind-killer.")
diff --git a/test/unit/gluster/test_gfapi.py b/test/unit/gluster/test_gfapi.py
index 5551235..d07ec67 100644
--- a/test/unit/gluster/test_gfapi.py
+++ b/test/unit/gluster/test_gfapi.py
@@ -97,7 +97,6 @@ class TestFile(unittest.TestCase):
self.assertRaises(OSError, self.fd.fchown, 9, 11)
def test_dup(self):
- raise SkipTest("glfs_dup is currently broken (BZ 1311146)")
mock_glfs_dup = Mock()
mock_glfs_dup.return_value = 2