summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xgluster/api.py4
-rwxr-xr-xgluster/gfapi.py1
-rw-r--r--test/functional/libgfapi-python-tests.py2
-rw-r--r--test/unit/gluster/test_gfapi.py1
4 files changed, 6 insertions, 2 deletions
diff --git a/gluster/api.py b/gluster/api.py
index c7270bb..c0bad67 100755
--- a/gluster/api.py
+++ b/gluster/api.py
@@ -348,8 +348,8 @@ glfs_fdatasync = gfapi_prototype('glfs_fdatasync', ctypes.c_int,
glfs_fsync = gfapi_prototype('glfs_fsync', ctypes.c_int,
ctypes.c_void_p)
-glfs_lseek = gfapi_prototype('glfs_lseek', ctypes.c_ulong,
- ctypes.c_void_p, ctypes.c_ulong,
+glfs_lseek = gfapi_prototype('glfs_lseek', ctypes.c_int,
+ ctypes.c_void_p, ctypes.c_int,
ctypes.c_int)
glfs_read = gfapi_prototype('glfs_read', ctypes.c_ssize_t,
diff --git a/gluster/gfapi.py b/gluster/gfapi.py
index 3a344c8..fa0e1b3 100755
--- a/gluster/gfapi.py
+++ b/gluster/gfapi.py
@@ -93,6 +93,7 @@ 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 bfd5c50..6840d18 100644
--- a/test/functional/libgfapi-python-tests.py
+++ b/test/functional/libgfapi-python-tests.py
@@ -20,6 +20,7 @@ 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:
@@ -227,6 +228,7 @@ 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 d07ec67..5551235 100644
--- a/test/unit/gluster/test_gfapi.py
+++ b/test/unit/gluster/test_gfapi.py
@@ -97,6 +97,7 @@ 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