Mercurial > kallithea
changeset 7754:76e2072b88f6
tests: push with force in test_vcs_operations.py _add_files_and_push
Some tests push a fixed branch name. If such tests are run twice, it will fail
second time when the other branch head already exists.
Work around that by using force and thus replace the old head.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Thu, 17 Jan 2019 03:56:34 +0100 |
| parents | d89217cca11a |
| children | a44228cd208b |
| files | kallithea/tests/other/test_vcs_operations.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/tests/other/test_vcs_operations.py Wed Jul 03 12:25:55 2019 +0200 +++ b/kallithea/tests/other/test_vcs_operations.py Thu Jan 17 03:56:34 2019 +0100 @@ -158,9 +158,9 @@ # PUSH it back stdout = stderr = None if vt.repo_type == 'hg': - stdout, stderr = Command(dest_dir).execute('hg push --verbose', clone_url, ignoreReturnCode=ignoreReturnCode) + stdout, stderr = Command(dest_dir).execute('hg push -f --verbose', clone_url, ignoreReturnCode=ignoreReturnCode) elif vt.repo_type == 'git': - stdout, stderr = Command(dest_dir).execute('git push --verbose', clone_url, "master", ignoreReturnCode=ignoreReturnCode) + stdout, stderr = Command(dest_dir).execute('git push -f --verbose', clone_url, "master", ignoreReturnCode=ignoreReturnCode) return stdout, stderr