# HG changeset patch # User Sean Farley # Date 1446164321 25200 # Node ID 3c213ca49f7e688c9290ff4de0f906f60eec7986 # Parent d227cf8d08602573a60cb0f1606970db91a808ec tests: update for behavior change in subversion 1.9 In revision r1592724, subversion changed 'svn propget' when no properties are there to be an error. This is mildly annoying but oh well. We work around this to achieve the old behavior. I pity the scripts that relied on that behavior. diff --git a/tests/test_util.py b/tests/test_util.py --- a/tests/test_util.py +++ b/tests/test_util.py @@ -358,8 +358,12 @@ def svnpropget(repo_path, path, prop, re stdout=subprocess.PIPE, stderr=subprocess.STDOUT) stdout, stderr = p.communicate() - if p.returncode: + if p.returncode and stderr: raise Exception('svn ls failed on %s: %r' % (path, stderr)) + if 'W200017' in stdout: + # subversion >= 1.9 changed 'no properties' to be an error, so let's + # avoid that + return '' return stdout.strip()