# HG changeset patch # User Mads Kiilerich # Date 2015-04-24 02:03:50 # Node ID 30419d563fb96eeb58cae4dd65781af71b36b264 # Parent 0fc040fa29bfc83e52d686d3955d8cbe108b6fd1 tests: update for git sometimes emitting 'Cloning into' on stderr Tests failed with Git 2.1.0 . diff --git a/kallithea/tests/other/manual_test_vcs_operations.py b/kallithea/tests/other/manual_test_vcs_operations.py --- a/kallithea/tests/other/manual_test_vcs_operations.py +++ b/kallithea/tests/other/manual_test_vcs_operations.py @@ -200,8 +200,8 @@ class TestVCSOperations(BaseTestCase): clone_url = _construct_url(GIT_REPO) stdout, stderr = Command('/tmp').execute('git clone', clone_url) - assert 'Cloning into' in stdout - assert stderr == '' + assert 'Cloning into' in stdout + stderr + assert stderr == '' or stdout == '' def test_clone_wrong_credentials_hg(self): clone_url = _construct_url(HG_REPO, passwd='bad!') @@ -532,5 +532,5 @@ class TestVCSOperations(BaseTestCase): clone_url = _construct_url(GIT_REPO) stdout, stderr = Command('/tmp').execute('git clone', clone_url) - assert 'Cloning into' in stdout - assert stderr == '' + assert 'Cloning into' in stdout + stderr + assert stderr == '' or stdout == ''