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