Author: kotkov
Date: Thu Nov 24 14:52:59 2022
New Revision: 1905509
URL: http://svn.apache.org/viewvc?rev=1905509&view=rev
Log:
On the 'pristines-on-demand-on-mwf' branch: Update basic_tests.py#8 so that
it would work in both pristine modes.
The test performs direct manipulations on the pristine file. But with
--store-pristine=no, we don't have that file available on disk, so let's
fix that by running `svn diff` for the modified file, as that will fetch
the required pristine.
* subversion/tests/cmdline/basic_tests.py
(basic_commit_corruption): Remove Wimp() marker. Call `svn diff` for
the modified file to have its pristine available locally.
Modified:
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/basic_tests.py
Modified:
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/basic_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/basic_tests.py?rev=1905509&r1=1905508&r2=1905509&view=diff
==============================================================================
---
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/basic_tests.py
(original)
+++
subversion/branches/pristines-on-demand-on-mwf/subversion/tests/cmdline/basic_tests.py
Thu Nov 24 14:52:59 2022
@@ -355,7 +355,6 @@ def basic_mkdir_wc_with_parents(sbox):
#----------------------------------------------------------------------
-@Wimp("Relies on wc.text_base_path()")
def basic_commit_corruption(sbox):
"basic corruption detection on commit"
@@ -378,6 +377,10 @@ def basic_commit_corruption(sbox):
mu_path = sbox.ospath('A/mu')
svntest.main.file_append(mu_path, 'appended mu text')
+ # We are about to manually edit mu's text-base, so run "diff" to
+ # guarantee that the text-base is available in all pristine modes.
+ svntest.actions.run_and_verify_svn(None, [], 'diff', mu_path)
+
# Created expected output tree for 'svn ci'
expected_output = wc.State(wc_dir, {
'A/mu' : Item(verb='Sending'),
