You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2014/03/11 12:12:59 UTC
svn commit: r1576282 -
/subversion/trunk/subversion/tests/cmdline/update_tests.py
Author: rhuijben
Date: Tue Mar 11 11:12:58 2014
New Revision: 1576282
URL: http://svn.apache.org/r1576282
Log:
Remove an obsolete test. The original problem can't occur any more since we
switched to resolving conflicts after the update instead of during the update.
The test itself was broken (and therefore marked Skip) for interactive
handling changes.
* subversion/tests/cmdline/update_tests.py
(eof_in_interactive_conflict_resolver): Remove test.
(test_list): Remove eof_in_interactive_conflict_resolver.
Modified:
subversion/trunk/subversion/tests/cmdline/update_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1576282&r1=1576281&r2=1576282&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Tue Mar 11 11:12:58 2014
@@ -3935,109 +3935,6 @@ def update_accept_conflicts(sbox):
svntest.tree.detect_conflict_files,
extra_files)
-# Test for a wc corruption race condition (possibly introduced in
-# r863416) which is easy to trigger if interactive conflict resolution
-# dies in the middle of prompting. Specifically, we run an update
-# with interactive-conflicts on but close stdin immediately, so the
-# prompt errors out; then the dir_baton pool cleanup handlers in the
-# WC update editor flush and run incomplete logs and lead to WC
-# corruption, detectable by another update command.
-
-# FIXME: With issue #4280 fixed and this test using --force-interactive,
-# the test driver can no longer redirect terminal input to cause
-# an EOF. Consequently, skip this test so that it does not hang
-# the test suite.
-@Skip()
-def eof_in_interactive_conflict_resolver(sbox):
- "eof in interactive resolution can't break wc"
-
- sbox.build()
- wc_dir = sbox.wc_dir
-
- # Set up a custom config directory which *doesn't* turn off
- # interactive resolution
- config_contents = '''\
-[auth]
-password-stores =
-
-[miscellany]
-interactive-conflicts = true
-'''
- tmp_dir = os.path.abspath(svntest.main.temp_dir)
- config_dir = os.path.join(tmp_dir, 'interactive-conflicts-config')
- svntest.main.create_config_dir(config_dir, config_contents)
-
- iota_path = sbox.ospath('iota')
-
- # Modify iota and commit for r2.
- svntest.main.file_append(iota_path, "Appended text in r2.\n")
- expected_output = svntest.wc.State(wc_dir, {
- 'iota': Item(verb="Sending"),
- })
- expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak('iota', wc_rev=2)
- svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
-
- # Go back to revision 1.
- expected_output = svntest.wc.State(wc_dir, {
- 'iota' : Item(status='U '),
- })
-
- expected_disk = svntest.main.greek_state.copy()
-
- expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
-
- svntest.actions.run_and_verify_update(wc_dir,
- expected_output,
- expected_disk,
- expected_status,
- None,
- None, None,
- None, None, 1,
- '-r1', wc_dir)
-
- # Modify iota differently and try to update *with the interactive
- # resolver*. ### The parser won't go so well with the output
- svntest.main.file_append(iota_path, "Local mods to r1 text.\n")
- svntest.actions.run_and_verify_update(
- wc_dir, None, None, None,
- "End of file while reading from terminal",
- None, None, None, None, 1,
- wc_dir, '--force-interactive', '--config-dir', config_dir)
-
- # Now update -r1 again. Hopefully we don't get a checksum error!
- expected_output = svntest.wc.State(wc_dir, {
- 'iota': Item(verb="Skipped"),
- })
-
- # The interactive callback aborts, so the file remains in conflict.
- expected_disk.tweak('iota', contents="This is the file 'iota'.\n"
- "<<<<<<< .mine\n"
- "Local mods to r1 text.\n"
- "=======\n"
- "Appended text in r2.\n"
- ">>>>>>> .r2\n"),
- expected_disk.add({
- 'iota.r1' : Item(contents="This is the file 'iota'.\n"),
- 'iota.r2' : Item(contents="This is the file 'iota'.\n"
- "Appended text in r2.\n"),
- 'iota.mine' : Item(contents="This is the file 'iota'.\n"
- "Local mods to r1 text.\n"),
- })
-
- expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
- expected_status.tweak('iota', status='C ', wc_rev=2)
-
- svntest.actions.run_and_verify_update(wc_dir,
- expected_output,
- expected_disk,
- expected_status,
- None,
- None, None,
- None, None, 1,
- '-r1', wc_dir)
-
#----------------------------------------------------------------------
@@ -6845,7 +6742,6 @@ test_list = [ None,
update_copied_from_replaced_and_changed,
update_copied_and_deleted_prop,
update_accept_conflicts,
- eof_in_interactive_conflict_resolver,
update_uuid_changed,
restarted_update_should_delete_dir_prop,
tree_conflicts_on_update_1_1,