changeset 5065:30419d563fb9

tests: update for git sometimes emitting 'Cloning into' on stderr Tests failed with Git 2.1.0 .
author Mads Kiilerich <madski@unity3d.com>
date Fri, 24 Apr 2015 02:03:50 +0200
parents 0fc040fa29bf
children 481a484b1d69
files kallithea/tests/other/manual_test_vcs_operations.py
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/tests/other/manual_test_vcs_operations.py	Fri Apr 24 02:03:50 2015 +0200
+++ b/kallithea/tests/other/manual_test_vcs_operations.py	Fri Apr 24 02:03:50 2015 +0200
@@ -200,8 +200,8 @@
         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 @@
         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 == ''