Commit 49602aca authored by Ramon Nou's avatar Ramon Nou Committed by Ramon Nou
Browse files

Activate Shell tests, now that fork works

parent bef487dc

tests/integration/shell/test_concat.py

+6 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ from harness.logger import logger 
large_file_01 = 'large_file_01'

large_file_02 = 'large_file_02'



@pytest.mark.skip(reason="using >> to concatenate files seems to hang clients")

#@pytest.mark.skip(reason="using >> to concatenate files seems to hang clients")

def test_concat(gkfs_daemon, gkfs_shell, file_factory):

    """Concatenate two large files"""
@@ -64,5 +64,9 @@ def test_concat(gkfs_daemon, gkfs_shell, file_factory): 
    assert cmd.parsed_stdout.digest == lf02.md5sum()



    ##XXX hangs!

    cmd = gkfs_client.bash('cat', gkfs_daemon.mountdir / large_file_01, '>>', gkfs_daemon.mountdir / large_file_02)

    cmd = gkfs_shell.script(

        f"""

            {gkfs_shell.patched_environ} cat {gkfs_daemon.mountdir / large_file_01} >> {gkfs_daemon.mountdir / large_file_02}

        """, intercept_shell=False)

    #cmd = gkfs_client.bash('cat', gkfs_daemon.mountdir / large_file_01, '>>', gkfs_daemon.mountdir / large_file_02)

    assert cmd.exit_code == 0

tests/integration/shell/test_cp.py

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ from harness.logger import logger 


file01 = 'file01'



@pytest.mark.skip(reason="shell tests seem to hang clients at times")

#@pytest.mark.skip(reason="shell tests seem to hang clients at times")

def test_cp(gkfs_daemon, gkfs_shell, file_factory):

    """Copy a file into gkfs using the shell"""

tests/integration/shell/test_stat.py

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ def test_shell_if_e(gkfs_daemon, gkfs_shell, file_factory): 


    assert cmd.exit_code == 0



@pytest.mark.skip(reason="shell tests seem to hang clients at times")

##@pytest.mark.skip(reason="shell tests seem to hang clients at times")

def test_stat_script(gkfs_daemon, gkfs_shell, file_factory):

    """

    Copy a file into gkfs using the shell and check that it
@@ -83,7 +83,7 @@ def test_stat_script(gkfs_daemon, gkfs_shell, file_factory): 


    assert cmd.exit_code == 0



@pytest.mark.skip(reason="shell tests seem to hang clients at times")

#@pytest.mark.skip(reason="shell tests seem to hang clients at times")

def test_stat_command(gkfs_daemon, gkfs_shell, file_factory):

    """

    Copy a file into gkfs using the shell and check that it