summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHumble Devassy Chirammal <humble.devassy@gmail.com>2016-03-18 03:42:48 -0700
committerGerrit Code Review <review@dev.gluster.org>2016-03-18 03:42:48 -0700
commit123c2b7dc51d012f6d2924f680eeec748187a300 (patch)
tree396c535a3a942458f0fd59cf4c6ef7cfb2cbd13e
parent9466403495084eb9a197c1fe30bfa40a68b8feec (diff)
parent8aa845cb8ebc45c76e041e5dded42ec9eaf45424 (diff)
Merge "Re-enable glfs_dup() tests"
-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 d6f847d..c84b262 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 3a0b89e..591fe7b 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 4be2346..84f6261 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