Author: hartmannathan
Date: Sun Jan 24 15:55:00 2021
New Revision: 1885880
URL: http://svn.apache.org/viewvc?rev=1885880&view=rev
Log:
branches/issue-4869: Continue work on regression test
* work-in-progress/regression-test.txt:
(info_tree_conflict_source): Continue work on the regression test.
Modified:
subversion/branches/issue-4869/work-in-progress/regression-test.txt
Modified: subversion/branches/issue-4869/work-in-progress/regression-test.txt
URL:
http://svn.apache.org/viewvc/subversion/branches/issue-4869/work-in-progress/regression-test.txt?rev=1885880&r1=1885879&r2=1885880&view=diff
==============================================================================
--- subversion/branches/issue-4869/work-in-progress/regression-test.txt
(original)
+++ subversion/branches/issue-4869/work-in-progress/regression-test.txt Sun Jan
24 15:55:00 2021
@@ -1,15 +1,18 @@
@Issue(4869)
def info_tree_conflict_source(sbox):
- """info --xml with tree conflicts, verify correct source-left and
- source-right."""
+ "info --xml: verify source-left, source-right"
sbox.build()
wc_dir = sbox.wc_dir
B_path = os.path.join(wc_dir, 'A', 'B')
lambda_path = os.path.join(B_path, 'lambda')
+ alpha_path = os.path.join(B_path, 'E', 'alpha')
+ F_path = os.path.join(B_path, 'F')
B2_url = sbox.repo_url + '/A/B2'
+ B2_path = os.path.join(wc_dir, 'A', 'B2')
+ lambda2_path = os.path.join(B2_path, 'lambda')
# Rev 2 copy B to B2
sbox.simple_repo_copy('A/B', 'A/B2')
@@ -23,7 +26,7 @@ def info_tree_conflict_source(sbox):
# - rename A/B/F to A/B/Z
# (tests the case in append_tree_conflict_info_xml())
- svntest.main.file_write('A/B/lambda', 'B/lambda side of conflict')
+ svntest.main.file_write(lambda_path, 'B/lambda side of conflict')
sbox.simple_propset('blue', 'azul', 'A/B/E/alpha')
sbox.simple_move('A/B/F', 'A/B/Z');
sbox.simple_commit()
@@ -33,7 +36,7 @@ def info_tree_conflict_source(sbox):
# add property to A/B2/E/alpha
# rename A/B2/F to A/B2/Y
- svntest.main.file_write('A/B2/lambda', 'B2/lambda side of conflict')
+ svntest.main.file_write(lambda2_path, 'B2/lambda side of conflict')
sbox.simple_propset('blue', 'bleue', 'A/B2/E/alpha')
sbox.simple_move('A/B2/F', 'A/B2/Y');
sbox.simple_commit()
@@ -42,20 +45,8 @@ def info_tree_conflict_source(sbox):
# and tree conflict
sbox.simple_update()
- # Stuff missing here:
- # .
- # .
- # .
-
- svntest.actions.run_and_verify_merge2(B_path, None, None,
- B2_url, None,
- expected_output,
- expected_mergeinfo_output,
- expected_elision_output,
- expected_disk,
- expected_status,
- expected_skip,
- [], False, False, False)
+ svntest.actions.run_and_verify_svn2(svntest.verify.AnyOutput, [],
+ 0, 'merge', B2_url, B_path)
# Verify 'svn info --xml' on the text conflicted case
@@ -65,11 +56,11 @@ def info_tree_conflict_source(sbox):
'--xml')
verify_xml_elements(output,
- [('version', {'revision' : '3',
+ [('version', {'revision' : '1',
'side' : 'source-left',
'kind' : 'file',
'path-in-repos': 'A/B/lambda',
- 'repos-url' : '.*',
+ 'repos-url' : sbox.repo_url,
},
)])
@@ -78,20 +69,56 @@ def info_tree_conflict_source(sbox):
'side' : 'source-right',
'kind' : 'file',
'path-in-repos': 'A/B2/lambda',
- 'repos-url' : '.*',
+ 'repos-url' : sbox.repo_url,
},
)])
# Verify 'svn info --xml' on the property conflicted case
- # Stuff missing here:
- # .
- # .
- # .
+ exit_code, output, error = svntest.actions.run_and_verify_svn(None,
+ [], 'info',
+ alpha_path,
+ '--xml')
+
+ verify_xml_elements(output,
+ [('version', {'revision' : '1',
+ 'side' : 'source-left',
+ 'kind' : 'file',
+ 'path-in-repos': 'A/B/E/alpha',
+ 'repos-url' : sbox.repo_url,
+ },
+ )])
+
+ verify_xml_elements(output,
+ [('version', {'revision' : '4',
+ 'side' : 'source-right',
+ 'kind' : 'file',
+ 'path-in-repos': 'A/B2/E/alpha',
+ 'repos-url' : sbox.repo_url,
+ },
+ )])
# Verify 'svn info --xml' on the tree conflicted case
- # Stuff missing here:
- # .
- # .
- # .
+ exit_code, output, error = svntest.actions.run_and_verify_svn(None,
+ [], 'info',
+ F_path,
+ '--xml')
+
+ verify_xml_elements(output,
+ [('version', {'revision' : '1',
+ 'side' : 'source-left',
+ 'kind' : 'dir',
+ 'path-in-repos': 'A/B/F',
+ 'repos-url' : sbox.repo_url,
+ },
+ )])
+
+ verify_xml_elements(output,
+ [('version', {'revision' : '4',
+ 'side' : 'source-right',
+ 'kind' : 'none',
+ 'path-in-repos': 'A/B2/F',
+ 'repos-url' : sbox.repo_url,
+ },
+ )])
