From: Amit Bawer <abawer(a)redhat.com>
At this point we expect all API calls to handle file paths
as either unicode strings or bytes. This applies to both python
versions.
XPASS/xfail expected for test_write_resource_4k_invalid_sector_size.
---
tests/python_test.py | 42 +++++++++++++-----------------------------
1 file changed, 13 insertions(+), 29 deletions(-)
diff --git a/tests/python_test.py b/tests/python_test.py
index b072d6a..af75020 100644
--- a/tests/python_test.py
+++ b/tests/python_test.py
@@ -34,26 +34,10 @@ ALIGNMENT_2M = 2 * MiB
SECTOR_SIZE_512 = 512
SECTOR_SIZE_4K = 4 * KiB
FILE_NAMES = [
- #name, encoding
- ("ascii", None),
- (u"ascii", None),
- pytest.param(
- u"\u05d0", None,
- marks=pytest.mark.xfail(
- six.PY2,
- reason="currently not supporting non-ascii paths")),
- pytest.param(
- u"\u05d0", "utf-8",
- marks=pytest.mark.xfail(
- six.PY3,
- reason="currently not supporting bytes paths")),
-]
-
-FILE_NAMES_NO_XFAILS = [
#name, encoding
("ascii", None),
(u"ascii", None),
(u"\u05d0", None),
(u"\u05d0", "utf-8"),
@@ -510,11 +494,11 @@ def test_write_resource_invalid_disk(tmpdir, sanlock_daemon, disk):
with pytest.raises(ValueError) as e:
sanlock.write_resource(b"ls_name", b"res_name", disks)
assert repr(disk) in str(e.value)
-(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS)
+(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES)
def test_killpath(tmpdir, sanlock_daemon, filename, encoding):
cmd_path = util.generate_path(tmpdir, filename, encoding)
fd = sanlock.register()
sanlock.killpath(cmd_path, [cmd_path], fd)
@@ -525,35 +509,35 @@ def raises_sanlock_errno(expected_errno=errno.ECONNREFUSED):
yield
assert e.value.errno == expected_errno
@pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES)
-(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS)
+(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES)
def test_rem_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding):
path = util.generate_path("/tmp/", filename, encoding)
with raises_sanlock_errno():
sanlock.rem_lockspace(name, 1, path, 0)
@pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES)
-(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS)
+(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES)
def test_add_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding):
path = util.generate_path("/tmp/", filename, encoding)
with raises_sanlock_errno():
sanlock.add_lockspace(name, 1, path, 0)
@pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES)
-(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS)
+(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES)
def test_write_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding):
path = util.generate_path("/tmp/", filename, encoding)
with raises_sanlock_errno():
sanlock.write_lockspace(name, path)
@pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES)
-(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS)
+(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES)
def test_write_resource_parse_args(no_sanlock_daemon, name, filename, encoding):
path = util.generate_path("/tmp/", filename, encoding)
disks = [(path, 0)]
with raises_sanlock_errno():
sanlock.write_resource(name, b"res_name", disks)
@@ -561,11 +545,11 @@ def test_write_resource_parse_args(no_sanlock_daemon, name,
filename, encoding):
with raises_sanlock_errno():
sanlock.write_resource(b"ls_name", name, disks)
@pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES)
-(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS)
+(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES)
def test_release_resource_parse_args(no_sanlock_daemon, name, filename, encoding):
path = util.generate_path("/tmp/", filename, encoding)
disks = [(path, 0)]
with raises_sanlock_errno():
sanlock.release(name, b"res_name", disks)
@@ -573,11 +557,11 @@ def test_release_resource_parse_args(no_sanlock_daemon, name,
filename, encoding
with raises_sanlock_errno():
sanlock.release(b"ls_name", name, disks)
@pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES)
-(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS)
+(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES)
def test_read_resource_owners_parse_args(no_sanlock_daemon, name, filename, encoding):
path = util.generate_path("/tmp/", filename, encoding)
disks = [(path, 0)]
with raises_sanlock_errno():
sanlock.read_resource_owners(name, b"res_name", disks)
@@ -591,11 +575,11 @@ def test_get_hosts_parse_args(no_sanlock_daemon, name):
with raises_sanlock_errno():
sanlock.get_hosts(name, 1)
@pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES)
-(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS)
+(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES)
def test_inq_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding):
path = util.generate_path("/tmp/", filename, encoding)
with raises_sanlock_errno():
sanlock.inq_lockspace(name, 1, path, wait=False)
@@ -617,40 +601,40 @@ def test_set_event_parse_args(no_sanlock_daemon, name):
with raises_sanlock_errno():
sanlock.set_event(name, 1, 1, 1)
@pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES)
-(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS)
+(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES)
def test_init_lockspace_parse_args(no_sanlock_daemon, name, filename, encoding):
path = util.generate_path("/tmp/", filename, encoding)
with raises_sanlock_errno(errno.ENODEV):
sanlock.init_lockspace(name, path)
@pytest.mark.parametrize("name", LOCKSPACE_OR_RESOURCE_NAMES)
-(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS)
+(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES)
def test_init_resource_parse_args(no_sanlock_daemon, name, filename, encoding):
path = util.generate_path("/tmp/", filename, encoding)
disks = [(path, 0)]
with raises_sanlock_errno(errno.ENOENT):
sanlock.init_resource(b"ls_name", name, disks)
with raises_sanlock_errno(errno.ENOENT):
sanlock.init_resource(name, b"res_name", disks)
-(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS)
+(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES)
def test_get_alignment_parse_args(no_sanlock_daemon, filename, encoding):
path = util.generate_path("/tmp/", filename, encoding)
with raises_sanlock_errno(errno.ENOENT):
sanlock.get_alignment(path)
-(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS)
+(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES)
def test_read_lockspace_parse_args(no_sanlock_daemon, filename, encoding):
path = util.generate_path("/tmp/", filename, encoding)
with raises_sanlock_errno():
sanlock.read_lockspace(path)
-(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES_NO_XFAILS)
+(a)pytest.mark.parametrize("filename,encoding", FILE_NAMES)
def test_read_resource_parse_args(no_sanlock_daemon, filename, encoding):
path = util.generate_path("/tmp/", filename, encoding)
with raises_sanlock_errno():
sanlock.read_resource(path)
--
2.17.2