Author: kotkov
Date: Thu Mar 2 11:29:45 2023
New Revision: 1907967
URL: http://svn.apache.org/viewvc?rev=1907967&view=rev
Log:
Remove a few conditional test @Skips that are no longer required, due to
a switch to using the `compatible-version` config option in tests.
* subversion/tests/cmdline/store_pristine_tests.py
(simple_checkout_without_pristine,
simple_commit_without_pristine,
simple_update_without_pristine,
simple_status_without_pristine,
simple_diff_without_pristine,
simple_revert_without_pristine,
update_modified_file_without_pristine,
simple_copy_without_pristine,
copy_modified_file_without_pristine,
simple_move_without_pristine,
move_modified_file_without_pristine,
checkout_incompatible_setting): Run these tests unconditionally.
* subversion/tests/cmdline/upgrade_tests.py
(upgrade_latest_format): Run this test unconditionally.
* subversion/tests/cmdline/svntest/main.py
(wc_supports_optional_pristine): Remove this now unused predicate.
Modified:
subversion/trunk/subversion/tests/cmdline/store_pristine_tests.py
subversion/trunk/subversion/tests/cmdline/svntest/main.py
subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/store_pristine_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/store_pristine_tests.py?rev=1907967&r1=1907966&r2=1907967&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/store_pristine_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/store_pristine_tests.py Thu Mar
2 11:29:45 2023
@@ -59,7 +59,6 @@ def simple_checkout_with_pristine(sbox):
'info', '--show-item=store-pristine', '--no-newline',
sbox.wc_dir)
-@SkipUnless(svntest.main.wc_supports_optional_pristine)
def simple_checkout_without_pristine(sbox):
"simple checkout without pristine"
@@ -108,7 +107,6 @@ def simple_commit_with_pristine(sbox):
expected_output,
expected_status)
-@SkipUnless(svntest.main.wc_supports_optional_pristine)
def simple_commit_without_pristine(sbox):
"simple commit without pristine"
@@ -181,7 +179,6 @@ def simple_update_with_pristine(sbox):
[], False,
'-r1', sbox.wc_dir)
-@SkipUnless(svntest.main.wc_supports_optional_pristine)
def simple_update_without_pristine(sbox):
"simple update without pristine"
@@ -278,7 +275,6 @@ def simple_status_with_pristine(sbox):
svntest.actions.run_and_verify_status(sbox.wc_dir,
expected_status)
-@SkipUnless(svntest.main.wc_supports_optional_pristine)
def simple_status_without_pristine(sbox):
"simple status without pristine"
@@ -366,7 +362,6 @@ def simple_diff_with_pristine(sbox):
svntest.actions.run_and_verify_svn(diff_output, [],
'diff', sbox.ospath('file'))
-@SkipUnless(svntest.main.wc_supports_optional_pristine)
def simple_diff_without_pristine(sbox):
"simple diff without pristine"
@@ -431,7 +426,6 @@ def simple_revert_with_pristine(sbox):
svntest.actions.run_and_verify_status(sbox.wc_dir,
expected_status)
-@SkipUnless(svntest.main.wc_supports_optional_pristine)
def simple_revert_without_pristine(sbox):
"simple revert without pristine"
@@ -508,7 +502,6 @@ def update_modified_file_with_pristine(s
expected_disk,
expected_status)
-@SkipUnless(svntest.main.wc_supports_optional_pristine)
def update_modified_file_without_pristine(sbox):
"update locally modified file without pristine"
@@ -586,7 +579,6 @@ def simple_copy_with_pristine(sbox):
svntest.actions.run_and_verify_status(sbox.wc_dir,
expected_status)
-@SkipUnless(svntest.main.wc_supports_optional_pristine)
def simple_copy_without_pristine(sbox):
"simple copy without pristine"
@@ -655,7 +647,6 @@ def copy_modified_file_with_pristine(sbo
svntest.actions.run_and_verify_status(sbox.wc_dir,
expected_status)
-@SkipUnless(svntest.main.wc_supports_optional_pristine)
def copy_modified_file_without_pristine(sbox):
"copy locally modified file without pristine"
@@ -724,7 +715,6 @@ def simple_move_with_pristine(sbox):
svntest.actions.run_and_verify_status(sbox.wc_dir,
expected_status)
-@SkipUnless(svntest.main.wc_supports_optional_pristine)
def simple_move_without_pristine(sbox):
"simple move without pristine"
@@ -793,7 +783,6 @@ def move_modified_file_with_pristine(sbo
svntest.actions.run_and_verify_status(sbox.wc_dir,
expected_status)
-@SkipUnless(svntest.main.wc_supports_optional_pristine)
def move_modified_file_without_pristine(sbox):
"move locally modified file without pristine"
@@ -829,7 +818,6 @@ def move_modified_file_without_pristine(
svntest.actions.run_and_verify_status(sbox.wc_dir,
expected_status)
-@SkipUnless(svntest.main.wc_supports_optional_pristine)
def checkout_incompatible_setting(sbox):
"checkout with incompatible pristine setting"
Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1907967&r1=1907966&r2=1907967&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Thu Mar 2
11:29:45 2023
@@ -1768,12 +1768,6 @@ def wc_format(ver=None):
return 31
raise Exception("Unrecognized version number '%s'" % (ver,))
-def wc_supports_optional_pristine():
- if options.wc_format_version is None:
- return True
- else:
- return wc_format(options.wc_format_version) >= 32
-
######################################################################
Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1907967&r1=1907966&r2=1907967&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Thu Mar 2
11:29:45 2023
@@ -1583,7 +1583,6 @@ def upgrade_1_0_with_externals(sbox):
})
run_and_verify_status_no_server(sbox.wc_dir, expected_status)
-@SkipUnless(lambda: svntest.main.options.wc_format_version is None)
def upgrade_latest_format(sbox):
"upgrade latest format without arguments"
