diff options
| -rw-r--r-- | obsapi/core.py | 10 | ||||
| -rw-r--r-- | test/test_api.py | 32 |
2 files changed, 18 insertions, 24 deletions
diff --git a/obsapi/core.py b/obsapi/core.py index 35a4884..3bc1e3c 100644 --- a/obsapi/core.py +++ b/obsapi/core.py @@ -428,10 +428,7 @@ class ObsApi(object): raise Exception(msg) return r - def set_flag(self, prj, pkg=None, flag=None): - if flag is None: - return None - + def set_flag(self, flag, prj, pkg=None): params = self.__flag_to_params(flag) params['cmd'] = 'set_flag' @@ -441,10 +438,7 @@ class ObsApi(object): except Exception as e: raise e - def remove_flag(self, prj, pkg=None, flag=None): - if flag is None: - return None - + def remove_flag(self, flag, prj, pkg=None): params = self.__flag_to_params(flag) params['cmd'] = 'remove_flag' diff --git a/test/test_api.py b/test/test_api.py index 52c6796..c8e40b2 100644 --- a/test/test_api.py +++ b/test/test_api.py @@ -544,20 +544,20 @@ def test_set_flag(requests_mock, target, flag, status, repository, arch): else: matcher = re.compile(r'/source/.+/[^/]*\?') requests_mock.post(matcher) - params = dict(cmd='set_flag', - flag=flag, - status=status, - repository=repository, - arch=arch) + flag = dict(flag=flag, + status=status, + repository=repository, + arch=arch) if target == 'project': - response = api.set_flag(prj, flag=params) + response = api.set_flag(flag, prj) else: - response = api.set_flag(prj, pkg, flag=params) + response = api.set_flag(flag, prj, pkg) assert response.status_code == 200 url = requests_mock.request_history[0].url - check_url_query_params(url, params) + flag['cmd'] = 'set_flag' + check_url_query_params(url, flag) # POST /source/<project>?cmd=remove_flag&repository=:opt&arch=:opt&flag=flag @@ -573,17 +573,17 @@ def test_remove_flag(requests_mock, target, flag, status, repository, arch): else: matcher = re.compile(r'/source/.+/[^/]*\?') requests_mock.post(matcher) - params = dict(cmd='remove_flag', - flag=flag, - status=status, - repository=repository, - arch=arch) + flag = dict(flag=flag, + status=status, + repository=repository, + arch=arch) if target == 'project': - response = api.remove_flag(prj, flag=params) + response = api.remove_flag(flag, prj) else: - response = api.remove_flag(prj, pkg, flag=params) + response = api.remove_flag(flag, prj, pkg) assert response.status_code == 200 url = requests_mock.request_history[0].url - check_url_query_params(url, params) + flag['cmd'] = 'remove_flag' + check_url_query_params(url, flag) |