Author: kotkov
Date: Mon Nov 28 12:58:42 2022
New Revision: 1905570
URL: http://svn.apache.org/viewvc?rev=1905570&view=rev
Log:
On the 'pristines-on-demand-on-mwf' branch: Skip basic_tests.py#9 when
a working copy is created with --store-pristine=no.
The test manually edits mu's text-base when mu is unmodified. Unmodified
files don't have their text-bases available with --store-pristine=no, so
I don't think we can adjust this test case to run without making significant
changes. We could add a separate test that would corrupt the text-base of
the file with local mods and run update, but I'd rather keep the original
test case as-is.
* subversion/tests/cmdline/basic_tests.py
(basic_update_corruption): Remove Wimp() marker. Skip if the working
copy is configured not to store local pristines.
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=1905570&r1=1905569&r2=1905570&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
Mon Nov 28 12:58:42 2022
@@ -424,7 +424,6 @@ def basic_commit_corruption(sbox):
expected_status)
#----------------------------------------------------------------------
-@Wimp("Relies on wc.text_base_path()")
def basic_update_corruption(sbox):
"basic corruption detection on update"
@@ -449,6 +448,12 @@ def basic_update_corruption(sbox):
svntest.actions.run_and_verify_svn(None, [],
'co', sbox.repo_url, other_wc)
+ # The test manually edits mu's text-base when mu is unmodified.
+ # Unmodified files don't have their text-bases available with
+ # --store-pristine=no, so skip if that is the case.
+ if not svntest.actions.get_wc_store_pristine(other_wc):
+ raise svntest.Skip('Test assumes a working copy with pristine')
+
# Make a local mod to mu
mu_path = sbox.ospath('A/mu')
svntest.main.file_append(mu_path, 'appended mu text')
