Commit 51724ca1 authored by Cage, Gregory's avatar Cage, Gregory
Browse files

Cleanup test history after tests finish

parent 914a6a13

tests/test_data_store.py

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ TEST_INT_TOOL_ID = "interactive_tool_generic_output" 
def test_no_persist_store(nova_instance: Connection, galaxy_instance: GalaxyInstance) -> None:

    with nova_instance.connect() as connection:

        store = connection.create_data_store(name="nova_galaxy_testing")

        store.mark_for_cleanup()

        history = galaxy_instance.histories.get_histories(name=store.name)

        assert len(history) > 0

    history = galaxy_instance.histories.get_histories(name=store.history_id, deleted=False)
@@ -43,6 +44,7 @@ def test_recover_tools(nova_instance: Connection) -> None: 


    with nova_instance.connect() as connection:

        store = connection.create_data_store(name="nova_galaxy_testing")

        store.mark_for_cleanup()

        tools = store.recover_tools()

        assert len(tools) > 0

        assert tools[0].get_url() is not None

tests/test_dataset.py

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ from nova.galaxy.dataset import Dataset 
def test_dataset_upload(nova_instance: Connection) -> None:

    with nova_instance.connect() as connection:

        store = connection.create_data_store(name="nova_galaxy_testing")

        store.mark_for_cleanup()

        input = Dataset("tests/test_files/test_text_file.txt")

        input.upload(store)

        assert input.get_content() is not None
@@ -15,6 +16,7 @@ def test_dataset_upload(nova_instance: Connection) -> None: 
def test_dataset_set_content_upload(nova_instance: Connection) -> None:

    with nova_instance.connect() as connection:

        store = connection.create_data_store(name="nova_galaxy_testing")

        store.mark_for_cleanup()

        input = Dataset()

        # File type is optional

        input.set_content(content="this is some content, that I'm setting", file_type=".txt")

tests/test_run_tool.py

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ TEST_INT_TOOL_ID = "interactive_tool_generic_output" 
def test_run_tool(nova_instance: Connection) -> None:

    with nova_instance.connect() as connection:

        store = connection.create_data_store(name="nova_galaxy_testing")

        store.mark_for_cleanup()

        test_tool = Tool(TEST_TOOL_ID)

        outputs = test_tool.run(data_store=store, params=Parameters())

        assert outputs is not None
@@ -28,6 +29,7 @@ def test_run_tool(nova_instance: Connection) -> None: 
def test_run_tool_interactive(nova_instance: Connection, galaxy_instance: GalaxyInstance) -> None:

    with nova_instance.connect() as connection:

        store = connection.create_data_store(name="nova_galaxy_testing")

        store.mark_for_cleanup()

        notebook = Dataset(path="tests/test_files/test_jupyter_notebook.ipynb")

        test_tool = Tool(TEST_INT_TOOL_ID)

        params = Parameters()
@@ -62,6 +64,7 @@ def test_run_tool_interactive(nova_instance: Connection, galaxy_instance: Galaxy 
def test_status(nova_instance: Connection) -> None:

    with nova_instance.connect() as connection:

        store = connection.create_data_store(name="nova_galaxy_testing")

        store.mark_for_cleanup()

        test_tool = Tool(TEST_INT_TOOL_ID)

        params = Parameters()

        state = test_tool.get_status()
@@ -77,6 +80,7 @@ def test_status(nova_instance: Connection) -> None: 
def test_cancel_tool(nova_instance: Connection) -> None:

    with nova_instance.connect() as connection:

        store = connection.create_data_store(name="nova_galaxy_testing")

        store.mark_for_cleanup()

        test_tool = Tool(TEST_INT_TOOL_ID)

        params = Parameters()

        test_tool.run_interactive(data_store=store, params=params, check_url=False)
@@ -88,6 +92,7 @@ def test_cancel_tool(nova_instance: Connection) -> None: 
def test_get_tool_stdout(nova_instance: Connection) -> None:

    with nova_instance.connect() as connection:

        store = connection.create_data_store(name="nova_galaxy_testing")

        store.mark_for_cleanup()

        test_tool = Tool(TEST_INT_TOOL_ID)

        params = Parameters()

        test_tool.run_interactive(data_store=store, params=params, check_url=False)