Author: kotkov Date: Fri Nov 18 13:33:10 2022 New Revision: 1905379 URL: http://svn.apache.org/viewvc?rev=1905379&view=rev Log: On the 'pristines-on-demand-on-mwf' branch: Following up on r1899622, fix the check in trans_tests.py#1.
* subversion/tests/cmdline/trans_tests.py (keywords_from_birth): Use `--ignore-keywords` when calling `svn cat` to obtain the expected pristine contents with detranslated keywords. Remove the @XFail() marker. Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/trans_tests.py Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/trans_tests.py URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/trans_tests.py?rev=1905379&r1=1905378&r2=1905379&view=diff ============================================================================== --- subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/trans_tests.py (original) +++ subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/trans_tests.py Fri Nov 18 13:33:10 2022 @@ -213,7 +213,6 @@ def keywords_off(path): ### This test is know to fail when Subversion is built in very deep ### directory structures, caused by SVN_KEYWORD_MAX_LEN being defined ### as 255. -@XFail(lambda: svntest.main.options.wc_format_version=='1.15') def keywords_from_birth(sbox): "commit new files with keywords active from birth" @@ -398,7 +397,8 @@ def keywords_from_birth(sbox): # after commit, so read it from the repo. if sbox.pristines_on_demand_enabled(): _, actual_textbase_kw, _ = svntest.main.run_svn(False, - 'cat', '-rHEAD', fixed_length_keywords_path) + 'cat', '-rHEAD', '--ignore-keywords', + fixed_length_keywords_path) else: fp = open(svntest.wc.text_base_path(fixed_length_keywords_path), 'r') actual_textbase_kw = fp.readlines()