diff -up ./test/local/test_diff_functions_svn.py.svn1.9 ./test/local/test_diff_functions_svn.py --- ./test/local/test_diff_functions_svn.py.svn1.9 2015-09-16 20:48:48.601333613 -0400 +++ ./test/local/test_diff_functions_svn.py 2015-09-16 20:49:54.681944050 -0400 @@ -36,6 +36,7 @@ import os import sys from test.io_wrapper import StringIO import subprocess +import re import wstool import wstool.helpers @@ -99,6 +100,7 @@ class WstoolDiffSvnTest(AbstractSCMTest) modify_svn_repo(clone_path) def check_diff_output(self, output): + output_fixed = re.sub("\(nonexistent\)", "(revision 0)", output) # svn output order varies between versions expected = ["""\ Index: clone/added.txt @@ -117,7 +119,7 @@ Index: clone/modified.txt for snippet in expected: for line in snippet.splitlines(): # assertIn is not supported in Python2.6 - self.assertTrue(line in output, output) + self.assertTrue(line in output_fixed, output) def test_wstool_diff_svn_outside(self): """Test diff output for svn when run outside workspace"""