Commit 651e2c18 authored by Ramon Nou's avatar Ramon Nou
Browse files

Merge branch 'rnou/320-test-needs-to-be-updated-to-remove-fd-10000-check' into 'master' 

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

Closes #320

Closes #320

See merge request !213
parents 225e7f45 38d81dfb

CHANGELOG.md

+3 −2
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). 
  - Added cppcheck code checking capabilities ([!214](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/214))



### Changed 



  - Tests check ret for -1 instead of 10000 fd ([!320](https://storage.bsc.es/gitlab/hpc/gekkofs/-/merge_requests/320))

    - Allow some more script tests to run as pthread_at_fork solved some issues.

    

### Fixed

tests/integration/forwarding/test_map.py

+9 −9
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
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
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
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'