Commit cb8d157f authored by mvdbeek's avatar mvdbeek
Browse files

Fix repo test setUp / tearDown

parent 8aea13ce

test/integration/test_repository_operations.py

+3 −1
Original line number Diff line number Diff line
@@ -26,10 +26,12 @@ class TestRepositoryInstallIntegrationTestCase(integration_util.IntegrationTestC 


    def setUp(self):

        super().setUp()

        self.setup_shed_config()

        self.dataset_populator = DatasetPopulator(self.galaxy_interactor)



    def tearDown(self):

        self.reset_shed_tools()

        return super().tearDown()



    def test_repository_installation(self):

        """
@@ -105,7 +107,7 @@ class TestRepositoryInstallIntegrationTestCase(integration_util.IntegrationTestC 
        assert repo_response['tool_shed_status']['revision_update'] == 'True'

        assert repo_response['changeset_revision'] == REVISION_3

        assert repo_response['ctx_rev'] == '3'

        # now install revision 4 (a.k.a a minor update)

        # now install revision 4 (or newer) (a.k.a a minor update)

        response = self._install_repository(revision=REVISION_4, version="0.0.3", verify_tool_absent=False)[0]

        assert response['changeset_revision'] == latest_revision

        assert response['installed_changeset_revision'] == REVISION_3

test/integration/uses_shed.py

+5 −1
Original line number Diff line number Diff line
@@ -59,13 +59,17 @@ class UsesShed: 
        config["conda_auto_install"] = True

        config["conda_prefix"] = os.environ.get('GALAXY_TEST_CONDA_PREFIX') or os.path.join(cls.conda_tmp_prefix, 'conda')



    def reset_shed_tools(self):

    def setup_shed_config(self):

        shutil.rmtree(self._app.config.shed_tools_dir, ignore_errors=True)

        os.makedirs(self._app.config.shed_tools_dir)

        self._app.config.shed_tools_dir = self.shed_tools_dir

        with open(self._app.config.shed_tool_config_file, "w") as tool_conf_file:

            tool_conf_file.write(SHED_TOOL_CONF.substitute(shed_tools_path=self._app.config.shed_tools_dir))

        # deleting the containing folder doesn't trigger a toolbox reload, so signal it now and wait until it's done

        self._app.queue_worker.send_control_task('reload_toolbox', get_response=True)



    def reset_shed_tools(self):

        self.setup_shed_config()

        model = self._app.install_model

        models_to_delete = [

            model.RepositoryRepositoryDependencyAssociation,