Resolve "Test needs to be updated to remove fd == 10000 check"

Ramon Nourequested to merge
rnou/320-test-needs-to-be-updated-to-remove-fd-10000-check into master

Closes #320 (closed)

Merge request reports

tests/integration/forwarding/test_map.py

+9 −9
Changes for tests/integration/forwarding/test_map.py: 9 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ def test_two_io_nodes(gkfwd_daemon_factory, gkfwd_client_factory): 
                           os.O_CREAT | os.O_WRONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    # write a buffer we know

    buf = b'42'
@@ -72,7 +72,7 @@ def test_two_io_nodes(gkfwd_daemon_factory, gkfwd_client_factory): 
                           os.O_RDONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    # read the file

    ret = c00.read(file, len(buf))
@@ -88,7 +88,7 @@ def test_two_io_nodes(gkfwd_daemon_factory, gkfwd_client_factory): 
                           os.O_CREAT | os.O_WRONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    # write a buffer we know

    buf = b'42'
@@ -101,7 +101,7 @@ def test_two_io_nodes(gkfwd_daemon_factory, gkfwd_client_factory): 
                           os.O_RDONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    # read the file

    ret = c01.read(file, len(buf))
@@ -154,7 +154,7 @@ def test_two_io_nodes_remap(gkfwd_daemon_factory, gkfwd_client_factory): 
                           os.O_CREAT | os.O_WRONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    # write a buffer we know

    buf = b'42'
@@ -184,7 +184,7 @@ def test_two_io_nodes_remap(gkfwd_daemon_factory, gkfwd_client_factory): 
                           os.O_CREAT | os.O_WRONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    # read the file

    buf = b'24'
@@ -218,7 +218,7 @@ def test_two_io_nodes_operations(gkfwd_daemon_factory, gkfwd_client_factory): 
                           os.O_CREAT | os.O_WRONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    # write a buffer we know

    buf = b'42'
@@ -231,7 +231,7 @@ def test_two_io_nodes_operations(gkfwd_daemon_factory, gkfwd_client_factory): 
                           os.O_RDONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    # read the file

    ret = c00.read(file, len(buf))
@@ -244,7 +244,7 @@ def test_two_io_nodes_operations(gkfwd_daemon_factory, gkfwd_client_factory): 
                           os.O_RDONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    # read the file

    ret = c01.read(file, len(buf))

tests/integration/operations/test_read_operations.py

+8 −8
Changes for tests/integration/operations/test_read_operations.py: 8 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ def test_read(gkfs_daemon, gkfs_client): 
                           os.O_CREAT | os.O_WRONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    # write a buffer we know

    buf = b'42'
@@ -62,7 +62,7 @@ def test_read(gkfs_daemon, gkfs_client): 
                           os.O_RDONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    # read the file

    ret = gkfs_client.read(file, len(buf))
@@ -79,7 +79,7 @@ def test_pread(gkfs_daemon, gkfs_client): 
                           os.O_CREAT | os.O_WRONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    # write a buffer we know

    buf = b'42'
@@ -92,7 +92,7 @@ def test_pread(gkfs_daemon, gkfs_client): 
                           os.O_RDONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    # read the file at offset 1024

    ret = gkfs_client.pread(file, len(buf), 1024)
@@ -109,7 +109,7 @@ def test_readv(gkfs_daemon, gkfs_client): 
                           os.O_CREAT | os.O_WRONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    # write a buffer we know

    buf_0 = b'42'
@@ -123,7 +123,7 @@ def test_readv(gkfs_daemon, gkfs_client): 
                           os.O_RDONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    # read the file

    ret = gkfs_client.readv(file, len(buf_0), len(buf_1))
@@ -141,7 +141,7 @@ def test_preadv(gkfs_daemon, gkfs_client): 
                           os.O_CREAT | os.O_WRONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    # write a buffer we know

    buf_0 = b'42'
@@ -155,7 +155,7 @@ def test_preadv(gkfs_daemon, gkfs_client): 
                           os.O_RDONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    # read the file

    ret = gkfs_client.preadv(file, len(buf_0), len(buf_1), 1024)

tests/integration/operations/test_unlink_operations.py

+2 −2
Changes for tests/integration/operations/test_unlink_operations.py: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ def test_unlink(gkfs_daemon, gkfs_client): 
                           os.O_CREAT | os.O_WRONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    # write a buffer we know

    buf = b'42'
@@ -89,7 +89,7 @@ def test_unlink(gkfs_daemon, gkfs_client): 
                           os.O_CREAT | os.O_WRONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    # > 4 chunks

    ret = gkfs_client.write_validate(file, 2097153)

tests/integration/operations/test_write_operations.py

+5 −5
Changes for tests/integration/operations/test_write_operations.py: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ def test_write(gkfs_daemon, gkfs_client): 
                           os.O_CREAT | os.O_WRONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    buf = b'42'

    ret = gkfs_client.write(file, buf, len(buf))
@@ -61,7 +61,7 @@ def test_write(gkfs_daemon, gkfs_client): 
                           os.O_CREAT | os.O_WRONLY | os.O_APPEND,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    str1 = b'Hello'

    str2 = b', World!'
@@ -93,7 +93,7 @@ def test_pwrite(gkfs_daemon, gkfs_client): 
                           os.O_CREAT | os.O_WRONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    buf = b'42'

    # write at the offset 1024
@@ -109,7 +109,7 @@ def test_writev(gkfs_daemon, gkfs_client): 
                           os.O_CREAT | os.O_WRONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    buf_0 = b'42'

    buf_1 = b'24'
@@ -125,7 +125,7 @@ def test_pwritev(gkfs_daemon, gkfs_client): 
                           os.O_CREAT | os.O_WRONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    buf_0 = b'42'

    buf_1 = b'24'

tests/integration/rename/test_rename_operation.py

+11 −11
Changes for tests/integration/rename/test_rename_operation.py: 11 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ def test_rename(gkfs_daemon, gkfs_client): 
                           os.O_CREAT | os.O_WRONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1

    

    ret = gkfs_client.access(file, os.R_OK)

    assert ret.retval == 0
@@ -85,7 +85,7 @@ def test_rename(gkfs_daemon, gkfs_client): 


    # Read contents of file2

    ret = gkfs_client.open(file2, os.O_RDONLY)

    assert ret.retval == 10000

    assert ret.retval != -1



    ret = gkfs_client.read(file2, len(buf))

    assert ret.retval == len(buf)
@@ -103,7 +103,7 @@ def test_rename_inverse(gkfs_daemon, gkfs_client): 
                           os.O_CREAT | os.O_WRONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1
@@ -133,7 +133,7 @@ def test_rename_inverse(gkfs_daemon, gkfs_client): 


    # Read contents of file2

    ret = gkfs_client.open(file4, os.O_RDONLY)

    assert ret.retval == 10000

    assert ret.retval != -1



    ret = gkfs_client.read(file4, len(buf))

    assert ret.retval == len(buf)
@@ -154,7 +154,7 @@ def test_chain_rename(gkfs_daemon, gkfs_client): 
                           os.O_CREAT | os.O_WRONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    # write a buffer we know

    buf = b'42'
@@ -182,7 +182,7 @@ def test_chain_rename(gkfs_daemon, gkfs_client): 


    # Read contents of file2

    ret = gkfs_client.open(fileb, os.O_RDONLY)

    assert ret.retval == 10000

    assert ret.retval != -1



    ret = gkfs_client.read(fileb, len(buf))

    assert ret.retval == len(buf)
@@ -240,7 +240,7 @@ def test_cyclic_rename(gkfs_daemon, gkfs_client): 
                           os.O_CREAT | os.O_WRONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    # write a buffer we know

    buf = b'42'
@@ -275,7 +275,7 @@ def test_cyclic_rename(gkfs_daemon, gkfs_client): 
    assert ret.retval == -1

    # Read contents of filee

    ret = gkfs_client.open(fileold, os.O_RDONLY)

    assert ret.retval == 10000

    assert ret.retval != -1



    ret = gkfs_client.read(fileold, len(buf))

    assert ret.retval == len(buf)
@@ -292,7 +292,7 @@ def test_rename_plus_trunc(gkfs_daemon, gkfs_client): 
                           os.O_CREAT | os.O_WRONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    # write a buffer we know

    buf = b'42'
@@ -331,7 +331,7 @@ def test_rename_plus_lseek(gkfs_daemon, gkfs_client): 
                           os.O_CREAT | os.O_WRONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    # write a buffer we know

    buf = b'42'
@@ -363,7 +363,7 @@ def test_rename_delete(gkfs_daemon, gkfs_client): 
                           os.O_CREAT | os.O_WRONLY,

                           stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)



    assert ret.retval == 10000

    assert ret.retval != -1



    # write a buffer we know

    buf = b'42'