Unverified Commit 40b31516 authored by Nicola Soranzo's avatar Nicola Soranzo
Browse files

Update ``test_purge_user`` test to use request parameter

parent 127e4612

lib/galaxy/tool_util/verify/interactor.py

+2 −2
Original line number Diff line number Diff line
@@ -938,10 +938,10 @@ class GalaxyInteractorApi: 
        kwd["timeout"] = kwd.pop("timeout", util.DEFAULT_SOCKET_TIMEOUT)

        return requests.post(url, **kwd)



    def _delete(self, path, data=None, key=None, headers=None, admin=False, anon=False, json=False):

    def _delete(self, path, data=None, key=None, headers=None, admin=False, anon=False, json=False, params=None):

        headers = self.api_key_header(key=key, admin=admin, anon=anon, headers=headers)

        url = self.get_api_url(path)

        kwd = self._prepare_request_params(data=data, as_json=json, headers=headers)

        kwd = self._prepare_request_params(data=data, as_json=json, params=params, headers=headers)

        kwd["timeout"] = kwd.pop("timeout", util.DEFAULT_SOCKET_TIMEOUT)

        return requests.delete(url, **kwd)

lib/galaxy_test/api/test_users.py

+4 −4
Original line number Diff line number Diff line
@@ -108,11 +108,11 @@ class TestUsersApi(ApiTestCase): 
        user = self._setup_user(TEST_USER_EMAIL_PURGE)

        response = self._delete(f"users/{user['id']}", admin=True)

        self._assert_status_code_is_ok(response)

        data = dict(purge="True")

        response = self._delete(f"users/{user['id']}", data=data, admin=True, json=True)

        params = dict(purge="True")

        response = self._delete(f"users/{user['id']}", params=params, admin=True, json=True)

        self._assert_status_code_is_ok(response)

        payload = {"deleted": "True"}

        purged_user = self._get(f"users/{user['id']}", payload, admin=True).json()

        params = {"deleted": "True"}

        purged_user = self._get(f"users/{user['id']}", params, admin=True).json()

        assert purged_user["deleted"] is True, purged_user

        assert purged_user["purged"] is True, purged_user