subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bre...@apache.org
Subject svn commit: r1446064 - /subversion/trunk/subversion/tests/cmdline/move_tests.py
Date Thu, 14 Feb 2013 08:27:27 GMT
Author: breser
Date: Thu Feb 14 08:27:26 2013
New Revision: 1446064

URL: http://svn.apache.org/r1446064
Log:
Add tests for move tracking of simple file moves.

* subversion/tests/cmdline/move_tests.py: Add new tests file.

Added:
    subversion/trunk/subversion/tests/cmdline/move_tests.py   (with props)

Added: subversion/trunk/subversion/tests/cmdline/move_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/move_tests.py?rev=1446064&view=auto
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/move_tests.py (added)
+++ subversion/trunk/subversion/tests/cmdline/move_tests.py Thu Feb 14 08:27:26 2013
@@ -0,0 +1,985 @@
+#!/usr/bin/env python
+#
+#  move_tests.py:  testing the local move tracking
+#
+#  Subversion is a tool for revision control.
+#  See http://subversion.apache.org for more information.
+#
+# ====================================================================
+#    Licensed to the Apache Software Foundation (ASF) under one
+#    or more contributor license agreements.  See the NOTICE file
+#    distributed with this work for additional information
+#    regarding copyright ownership.  The ASF licenses this file
+#    to you under the Apache License, Version 2.0 (the
+#    "License"); you may not use this file except in compliance
+#    with the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing,
+#    software distributed under the License is distributed on an
+#    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#    KIND, either express or implied.  See the License for the
+#    specific language governing permissions and limitations
+#    under the License.
+######################################################################
+
+
+# General modules
+import os, re, logging
+
+logger = logging.getLogger()
+
+# Our testing module
+import svntest
+from svntest import wc, actions, verify
+
+# (abbreviation)
+Skip = svntest.testcase.Skip_deco
+SkipUnless = svntest.testcase.SkipUnless_deco
+XFail = svntest.testcase.XFail_deco
+Issues = svntest.testcase.Issues_deco
+Issue = svntest.testcase.Issue_deco
+Wimp = svntest.testcase.Wimp_deco
+Item = svntest.wc.StateItem
+exp_noop_up_out = svntest.actions.expected_noop_update_output
+
+def build_incoming_changes_file(sbox, source, dest):
+  "Build up revs to receive incoming changes over our local file move"
+
+  # r1 = greek tree sandbox
+
+  # r2 = Modify source of moved file
+  sbox.simple_append(source, "modified\n")
+  sbox.simple_commit(message="Modify source of moved file")
+
+  # r3 = Delete source of moved file
+  sbox.simple_rm(source)
+  sbox.simple_commit(message="Delete source of moved file")
+
+  # r4 = Replace source of moved file
+  # To get a replace update from r2 to r4.
+  sbox.simple_add_text("This is the replaced file.\n", source)
+  sbox.simple_commit(message="Replace source of moved file")
+
+  # r5 = Add destination of moved file
+  sbox.simple_add_text("This is the destination file.\n", dest)
+  sbox.simple_commit(message="Add destination of moved file")
+
+  # r6 = Modify destination of moved file
+  sbox.simple_append(dest, "modified\n")
+  sbox.simple_commit(message="Modify destination of moved file")
+
+  # r7 = Delete destination of moved file
+  sbox.simple_rm(dest)
+  sbox.simple_commit(message="Delete destination of moved file")
+
+  # r8 = Copy destination of moved file
+  sbox.simple_copy('A/mu', dest)
+  sbox.simple_commit(message="Copy destination of moved file")
+
+  # r9 = Replace destination of moved file
+  sbox.simple_rm(dest)
+  sbox.simple_add_text("This is the destination file.\n", dest)
+  sbox.simple_commit(message="Replace destination of moved file")
+
+  # r10 = Add property on destination of moved file.
+  sbox.simple_propset("foo", "bar", dest)
+  sbox.simple_commit(message="Add property on destination of moved file")
+
+  # r11 = Modify property on destination of moved file.
+  sbox.simple_propset("foo", "baz", dest)
+  sbox.simple_commit(message="Modify property on destination of moved file")
+
+  # r12 = Delete property on destination of moved file.
+  sbox.simple_propdel("foo", dest)
+  sbox.simple_commit(message="Delete property on destination of moved file")
+
+  # r13 = Remove destination again (not needed for any test just cleanup). 
+  sbox.simple_rm(dest)
+  sbox.simple_commit(message="Remove destination (cleanup)")
+
+  # r14 = Add property on source of moved file.
+  sbox.simple_propset("foo", "bar", source)
+  sbox.simple_commit(message="Add property on source of moved file")
+  
+  # r15 = Modify property on source of moved file.
+  sbox.simple_propset("foo", "baz", source)
+  sbox.simple_commit(message="Modify property on source of moved file")
+
+  # r16 = Delete property on source of moved file.
+  sbox.simple_propdel("foo", source)
+  sbox.simple_commit(message="Delete property on source of moved file")
+
+  # r17 = Move that is identical to our local move.
+  sbox.simple_move(source, dest)
+  sbox.simple_commit(message="Identical move to our local move")
+
+def move_file_test(sbox, source, dest, move_func, test):
+  """Execute a series of actions to test local move tracking.  sbox is the
+  sandbox we're working in, source is the source of the move, dest is the
+  destination for the move and tests is various other parameters of the move
+  testing.  In particular:
+  start_rev: revision to update to before starting
+  start_output: validate the output of the start update against this.
+  start_disk: validate the on disk state after the start update against this.
+  start_status: validate the wc status after the start update against this.
+  end_rev: revision to update to, bringing in some update you want to test.
+  up_output: validate the output of the end update agianst this.
+  up_disk: validate the on disk state after the end update against this.
+  up_status: validate the wc status after the end update against this.
+  revert_paths: validate the paths reverted.
+  resolves: A directory of resolve accept arguments to test, the whole test will
+            be run for each.  The value is a directory with the following keys:
+            output: validate the output of the resolve command against this.
+            error: validate the error of the resolve command against this.
+            status: validate the wc status after the resolve against this.
+            revert_paths: override the paths reverted check in the test."""
+
+  wc_dir = sbox.wc_dir
+
+  source_path = sbox.ospath(source)
+  dest_path = sbox.ospath(dest)
+
+  # Deal with if there's no resolves key, as in we're not going to 
+  # do a resolve.
+  if not 'resolves' in test or not test['resolves']:
+    test['resolves'] = {None: None}
+ 
+  # Do the test for every type of resolve provided.
+  for resolve_accept in test['resolves'].keys():
+
+    # update to start_rev
+    svntest.actions.run_and_verify_update(wc_dir, test['start_output'],
+                                          test['start_disk'], test['start_status'],
+                                          None, None, None, None, None, False,
+                                          '-r', test['start_rev'], wc_dir)
+    # execute the move
+    move_func(test['start_rev'])
+
+    # update to end_rev, which will create a conflict 
+    # TODO: Limit the property checks to only when we're doing something with
+    # properties.
+    svntest.actions.run_and_verify_update(wc_dir, test['up_output'],
+                                          test['up_disk'], test['up_status'],
+                                          None, None, None, None, None, True,
+                                          '-r', test['end_rev'], wc_dir)
+
+    revert_paths = None
+    if 'revert_paths' in test:
+      revert_paths = test['revert_paths']
+
+    # resolve the conflict
+    # TODO: Switch to using run_and_verify_resolve, can't use it right now because
+    # it's not friendly with the output of resolutions right now.
+    if resolve_accept:
+      resolve = test['resolves'][resolve_accept]
+      if not 'output' in resolve:
+        resolve['output'] = None
+      if not 'error' in resolve:
+        resolve['error'] = [] 
+      if 'revert_paths' in resolve:
+        revert_paths = resolve['revert_paths']
+      svntest.actions.run_and_verify_svn('Resolve modification to source of move',
+                                          resolve['output'], resolve['error'],
+                                          'resolve', '--accept', resolve_accept,
+                                          '-R', wc_dir)
+
+      # TODO: This should be moved into the run_and_verify_resolve mentioned
+      # above.
+      if resolve['status']:
+        svntest.actions.run_and_verify_status(wc_dir, resolve['status'])
+
+      # TODO: Maybe we should validate the disk state as well?
+
+    # revert to preprare for the next test 
+    svntest.actions.run_and_verify_revert(revert_paths, '-R', wc_dir)
+
+# tests is an array of test dictionaries that move_file_test above will take
+def move_file_tests(sbox, source, dest, move_func, tests):
+  for test in tests:
+    move_file_test(sbox, source, dest, move_func, test)
+
+def build_simple_file_move_tests(sbox, source, dest):
+  """Given a sandbox, source and destination build the array of tests for
+     a file move"""
+
+  wc_dir = sbox.wc_dir
+  source_path = sbox.ospath(source)
+  dest_path = sbox.ospath(dest)
+
+  # Build the tests list
+  tests = []
+
+  # move and update with incoming change to source (r1-2).
+  test = {}
+  test['start_rev'] = 1
+  test['end_rev'] = 2
+  test['start_output'] = None
+  test['start_disk'] = None
+  test['start_status'] = None
+  test['up_output'] = svntest.wc.State(wc_dir, {
+    source : Item(status='  ', treeconflict='C'),
+  })
+  test['up_disk'] = svntest.main.greek_state.copy()
+  test['up_disk'].add({
+    dest: Item("This is the file 'lambda'.\n")
+  })
+  test['up_disk'].remove(source)
+  test['up_status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+  test['up_status'].tweak(source, status='D ', moved_to=dest,
+                          treeconflict='C')
+  test['up_status'].add({dest: Item(status='A ', moved_from=source,
+                                    copied='+', wc_rev='-')})
+  mc = {}
+  mc['output'] = svntest.verify.ExpectedOutput(
+    "Resolved conflicted state of '%s'\n" % source_path, match_all=False
+  )
+  mc['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev']) 
+  mc['status'].tweak(source, status='D ', moved_to=dest)
+  mc['status'].add({dest: Item(status='A ', moved_from=source,
+                               copied='+', wc_rev='-')})
+  tc = {}
+  tc['output'] = svntest.verify.ExpectedOutput(
+    "Resolved conflicted state of '%s'\n" % source_path, match_all=False
+  )
+  # theirs-conflict breaks the move
+  tc['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev']) 
+  tc['status'].tweak(source, status='D ')
+  tc['status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
+  working = {}
+  working['output'] = svntest.verify.ExpectedOutput(
+    "Resolved conflicted state of '%s'\n" % source_path, match_all=False
+  )
+  # working breaks the move as well
+  working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev']) 
+  working['status'].tweak(source, status='D ')
+  working['status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
+  test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+                      'working': working}
+  test['revert_paths'] = [source_path, dest_path]
+  tests.append(test)
+
+  # move and update with incoming deletion of source (r2-3)
+  test = {}
+  test['start_rev'] = 2
+  test['end_rev'] = 3
+  test['start_output'] = None
+  test['start_disk'] = None
+  test['start_status'] = None
+  test['up_output'] = svntest.wc.State(wc_dir, {
+    source : Item(status='  ', treeconflict='C'),
+  })
+  test['up_disk'] = svntest.main.greek_state.copy()
+  test['up_disk'].add({
+    dest: Item("This is the file 'lambda'.\nmodified\n")
+  })
+  test['up_disk'].remove(source)
+  test['up_status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+  test['up_status'].tweak(source, status='! ', treeconflict='C', wc_rev=None)
+  test['up_status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
+  # mine-conflict and theirs-conflict don't work.
+  mc = {}
+  mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+  mc['status'] = test['up_status']
+  tc = {}
+  tc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+  tc['status'] = test['up_status']
+  working = {}
+  working['output'] = svntest.verify.ExpectedOutput(
+    "Resolved conflicted state of '%s'\n" % source_path, match_all=False
+  )
+  # move is broken now
+  working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev']) 
+  working['status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
+  working['status'].remove(source)
+  working['revert_paths'] = [dest_path]
+  test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+                      'working': working}
+  test['revert_paths'] = [dest_path, source_path]
+  tests.append(test)
+
+  # move and update with incoming replacement of source (r2-4)
+  test = {}
+  test['start_rev'] = 2
+  test['end_rev'] = 4
+  test['start_output'] = None
+  test['start_disk'] = None
+  test['start_status'] = None
+  test['up_output'] = svntest.wc.State(wc_dir, {
+    source : Item(status='  ', prev_status='  ', treeconflict='A',
+                  prev_treeconflict='C'),
+    })
+  test['up_disk'] = svntest.main.greek_state.copy()
+  test['up_disk'].add({
+    dest: Item("This is the file 'lambda'.\nmodified\n")
+  })
+  test['up_disk'].remove(source)
+  test['up_status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+  # XXX: Is entry_status='  ' really right here?
+  test['up_status'].tweak(source, status='! ', treeconflict='C', entry_status='  ')
+  test['up_status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
+  # mine-conflict and theirs-conflict don't work.
+  mc = {}
+  mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+  mc['status'] = test['up_status']
+  tc = {}
+  tc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+  tc['status'] = test['up_status']
+  working = {}
+  working['output'] = svntest.verify.ExpectedOutput(
+    "Resolved conflicted state of '%s'\n" % source_path, match_all=False
+  )
+  # XXX: Not sure this status is really correct here
+  working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev']) 
+  working['status'].tweak(source, status='! ')
+  working['status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
+  test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+                      'working': working}
+  test['revert_paths'] = [source_path, dest_path]
+  tests.append(test)
+
+  # move and update with incoming add of dest (r4-5)
+  test = {}
+  test['start_rev'] = 4
+  test['end_rev'] = 5
+  test['start_output'] = None
+  test['start_disk'] = None
+  test['start_status'] = None
+  test['up_output'] = svntest.wc.State(wc_dir, {
+    dest : Item(status='  ', treeconflict='C'),
+    })
+  test['up_disk'] = svntest.main.greek_state.copy()
+  test['up_disk'].add({
+    dest: Item("This is the replaced file.\n")
+  })
+  test['up_disk'].remove(source)
+  test['up_status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+  test['up_status'].tweak(source, status='D ', moved_to=dest)
+  test['up_status'].add({dest: Item(status='R ', copied='+', treeconflict='C',
+                                    wc_rev='-', moved_from=source)})
+  # mine-conflict and theirs-conflict don't work.
+  mc = {}
+  mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+  mc['status'] = test['up_status']
+  tc = {}
+  tc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+  tc['status'] = test['up_status']
+  working = {}
+  working['output'] = svntest.verify.ExpectedOutput(
+    "Resolved conflicted state of '%s'\n" % dest_path, match_all=False
+  )
+  # working converts the move into a replacement
+  working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev']) 
+  working['status'].tweak(source, status='D ', moved_to=dest)
+  working['status'].add({dest: Item(status='R ', moved_from=source,
+                                    copied='+', wc_rev='-')})
+  test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+                      'working': working}
+  test['revert_paths'] = [source_path, dest_path]
+  tests.append(test)
+
+  # move and update with incoming add of dest (r4-6)
+  # we're going 4-6 because we're not testing a replacement move
+  test = {}
+  test['start_rev'] = 4
+  test['end_rev'] = 6
+  test['start_output'] = None
+  test['start_disk'] = None
+  test['start_status'] = None
+  test['up_output'] = svntest.wc.State(wc_dir, {
+    dest : Item(status='  ', treeconflict='C'),
+    })
+  test['up_disk'] = svntest.main.greek_state.copy()
+  test['up_disk'].add({
+    dest: Item("This is the replaced file.\n")
+  })
+  test['up_disk'].remove(source)
+  test['up_status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+  test['up_status'].tweak(source, status='D ', moved_to=dest)
+  test['up_status'].add({dest: Item(status='R ', copied='+', treeconflict='C',
+                                    wc_rev='-', moved_from=source)})
+  # mine-conflict and theirs-conflict don't work.
+  mc = {}
+  mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+  mc['status'] = test['up_status']
+  tc = {}
+  tc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+  tc['status'] = test['up_status']
+  working = {}
+  working['accept'] = 'working'
+  working['output'] = svntest.verify.ExpectedOutput(
+    "Resolved conflicted state of '%s'\n" % dest_path, match_all=False
+  )
+  # working converts the move into a replacement
+  working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev']) 
+  working['status'].tweak(source, status='D ', moved_to=dest)
+  working['status'].add({dest: Item(status='R ', moved_from=source,
+                                    copied='+', wc_rev='-')})
+  test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+                      'working': working}
+  test['revert_paths'] = [source_path, dest_path]
+  tests.append(test)
+
+  # move and update with incoming delete of dest (r4-7)
+  # Since we're not testing a replacement move the incoming delete has to
+  # be done starting from a rev where the file doesn't exist.  So it ends
+  # up being a no-op update.  So this test might be rather pointless.
+  test = {}
+  test['start_rev'] = 4
+  test['end_rev'] = 7
+  test['start_output'] = None
+  test['start_disk'] = None
+  test['start_status'] = None
+  test['up_output'] = svntest.wc.State(wc_dir, { })
+  test['up_disk'] = svntest.main.greek_state.copy()
+  test['up_disk'].add({
+    dest: Item("This is the replaced file.\n")
+  })
+  test['up_disk'].remove(source)
+  test['up_status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+  test['up_status'].tweak(source, status='D ', moved_to=dest)
+  test['up_status'].add({dest: Item(status='A ', copied='+',
+                                    wc_rev='-', moved_from=source)})
+  # no conflict so no resolve.
+  test['revert_paths'] = [source_path, dest_path]
+  tests.append(test)
+
+  # move and update with incoming copy to dest (r7-8)
+  test = {}
+  test['start_rev'] = 7
+  test['end_rev'] = 8
+  test['start_output'] = None
+  test['start_disk'] = None
+  test['start_status'] = None
+  test['up_output'] = svntest.wc.State(wc_dir, {
+    dest : Item(status='  ', treeconflict='C'),
+    })
+  test['up_disk'] = svntest.main.greek_state.copy()
+  test['up_disk'].add({
+    dest: Item("This is the replaced file.\n")
+  })
+  test['up_disk'].remove(source)
+  test['up_status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+  test['up_status'].tweak(source, status='D ', moved_to=dest)
+  test['up_status'].add({dest: Item(status='R ', copied='+', treeconflict='C',
+                                    wc_rev='-', moved_from=source)})
+  # mine-conflict and theirs-conflict don't work.
+  mc = {}
+  mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+  mc['status'] = test['up_status']
+  tc = {}
+  tc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+  tc['status'] = test['up_status']
+  working = {}
+  working['output'] = svntest.verify.ExpectedOutput(
+    "Resolved conflicted state of '%s'\n" % dest_path, match_all=False
+  )
+  # working converts the move into a replacement
+  working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev']) 
+  working['status'].tweak(source, status='D ', moved_to=dest)
+  working['status'].add({dest: Item(status='R ', moved_from=source,
+                                    copied='+', wc_rev='-')})
+  test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+                      'working': working}
+  test['revert_paths'] = [source_path, dest_path]
+  tests.append(test)
+
+  # move and update with incoming replace to dest (r7-9)
+  test = {}
+  test['start_rev'] = 7
+  test['end_rev'] = 9
+  test['start_output'] = None
+  test['start_disk'] = None
+  test['start_status'] = None
+  test['up_output'] = svntest.wc.State(wc_dir, {
+    dest : Item(status='  ', treeconflict='C'),
+    })
+  test['up_disk'] = svntest.main.greek_state.copy()
+  test['up_disk'].add({
+    dest: Item("This is the replaced file.\n")
+  })
+  test['up_disk'].remove(source)
+  test['up_status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+  test['up_status'].tweak(source, status='D ', moved_to=dest)
+  test['up_status'].add({dest: Item(status='R ', copied='+', treeconflict='C',
+                                    wc_rev='-', moved_from=source)})
+  # mine-conflict and theirs-conflict don't work.
+  mc = {}
+  mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+  mc['status'] = test['up_status']
+  tc = {}
+  tc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+  tc['status'] = test['up_status']
+  working = {}
+  working['output'] = svntest.verify.ExpectedOutput(
+    "Resolved conflicted state of '%s'\n" % dest_path, match_all=False
+  )
+  # working converts the move into a replacement
+  working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev']) 
+  working['status'].tweak(source, status='D ', moved_to=dest)
+  working['status'].add({dest: Item(status='R ', moved_from=source,
+                                    copied='+', wc_rev='-')})
+  test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+                      'working': working}
+  test['revert_paths'] = [source_path, dest_path]
+  tests.append(test)
+
+  # move and update with incoming property addition to dest (r7-10)
+  test = {}
+  test['start_rev'] = 7
+  test['end_rev'] = 10 
+  test['start_output'] = None
+  test['start_disk'] = None
+  test['start_status'] = None
+  test['up_output'] = svntest.wc.State(wc_dir, {
+    dest : Item(status='  ', treeconflict='C'),
+    })
+  test['up_disk'] = svntest.main.greek_state.copy()
+  test['up_disk'].add({
+    dest: Item("This is the replaced file.\n")
+  })
+  test['up_disk'].remove(source)
+  test['up_status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+  test['up_status'].tweak(source, status='D ', moved_to=dest)
+  test['up_status'].add({dest: Item(status='R ', copied='+', treeconflict='C',
+                                    wc_rev='-', moved_from=source)})
+  # mine-conflict and theirs-conflict don't work.
+  mc = {}
+  mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+  mc['status'] = test['up_status']
+  tc = {}
+  tc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+  tc['status'] = test['up_status']
+  working = {}
+  working['output'] = svntest.verify.ExpectedOutput(
+    "Resolved conflicted state of '%s'\n" % dest_path, match_all=False
+  )
+  # working converts the move into a replacement
+  working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev']) 
+  working['status'].tweak(source, status='D ', moved_to=dest)
+  working['status'].add({dest: Item(status='R ', moved_from=source,
+                                    copied='+', wc_rev='-')})
+  test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+                      'working': working}
+  test['revert_paths'] = [source_path, dest_path]
+  tests.append(test)
+
+  # move and update with incoming property modification to dest (r7-11)
+  test = {}
+  test['start_rev'] = 7
+  test['end_rev'] = 11 
+  test['start_output'] = None
+  test['start_disk'] = None
+  test['start_status'] = None
+  test['up_output'] = svntest.wc.State(wc_dir, {
+    dest : Item(status='  ', treeconflict='C'),
+    })
+  test['up_disk'] = svntest.main.greek_state.copy()
+  test['up_disk'].add({
+    dest: Item("This is the replaced file.\n")
+  })
+  test['up_disk'].remove(source)
+  test['up_status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+  test['up_status'].tweak(source, status='D ', moved_to=dest)
+  test['up_status'].add({dest: Item(status='R ', copied='+', treeconflict='C',
+                                    wc_rev='-', moved_from=source)})
+  # mine-conflict and theirs-conflict don't work.
+  mc = {}
+  mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+  mc['status'] = test['up_status']
+  tc = {}
+  tc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+  tc['status'] = test['up_status']
+  working = {}
+  working['output'] = svntest.verify.ExpectedOutput(
+    "Resolved conflicted state of '%s'\n" % dest_path, match_all=False
+  )
+  # working converts the move into a replacement
+  working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev']) 
+  working['status'].tweak(source, status='D ', moved_to=dest)
+  working['status'].add({dest: Item(status='R ', moved_from=source,
+                                    copied='+', wc_rev='-')})
+  test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+                      'working': working}
+  test['revert_paths'] = [source_path, dest_path]
+  tests.append(test)
+
+  # move and update with incoming property deletion to dest (r7-12)
+  test = {}
+  test['start_rev'] = 7
+  test['end_rev'] = 12 
+  test['start_output'] = None
+  test['start_disk'] = None
+  test['start_status'] = None
+  test['up_output'] = svntest.wc.State(wc_dir, {
+    dest : Item(status='  ', treeconflict='C'),
+    })
+  test['up_disk'] = svntest.main.greek_state.copy()
+  test['up_disk'].add({
+    dest: Item("This is the replaced file.\n")
+  })
+  test['up_disk'].remove(source)
+  test['up_status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+  test['up_status'].tweak(source, status='D ', moved_to=dest)
+  test['up_status'].add({dest: Item(status='R ', copied='+', treeconflict='C',
+                                    wc_rev='-', moved_from=source)})
+  # mine-conflict and theirs-conflict don't work.
+  mc = {}
+  mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+  mc['status'] = test['up_status']
+  tc = {}
+  tc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+  tc['status'] = test['up_status']
+  working = {}
+  working['output'] = svntest.verify.ExpectedOutput(
+    "Resolved conflicted state of '%s'\n" % dest_path, match_all=False
+  )
+  # working converts the move into a replacement
+  working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev']) 
+  working['status'].tweak(source, status='D ', moved_to=dest)
+  working['status'].add({dest: Item(status='R ', moved_from=source,
+                                    copied='+', wc_rev='-')})
+  test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+                      'working': working}
+  test['revert_paths'] = [source_path, dest_path]
+  tests.append(test)
+
+  # move and update with incoming property addition to source (r13-14)
+  test = {}
+  test['start_rev'] = 13
+  test['end_rev'] = 14 
+  test['start_output'] = None
+  test['start_disk'] = None
+  test['start_status'] = None
+  test['up_output'] = svntest.wc.State(wc_dir, {
+    source : Item(status='  ', treeconflict='C'),
+    })
+  test['up_disk'] = svntest.main.greek_state.copy()
+  test['up_disk'].add({
+    dest: Item("This is the replaced file.\n")
+  })
+  test['up_disk'].remove(source)
+  test['up_status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+  test['up_status'].tweak(source, status='D ', moved_to=dest, treeconflict='C')
+  test['up_status'].add({dest: Item(status='A ', copied='+', wc_rev='-',
+                                    moved_from=source)})
+  mc = {}
+  mc['output'] = svntest.verify.ExpectedOutput(
+    "Resolved conflicted state of '%s'\n" % source_path, match_all=False
+  )
+  mc['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev']) 
+  mc['status'].tweak(source, status='D ', moved_to=dest)
+  mc['status'].add({dest: Item(status='A ', moved_from=source,
+                               copied='+', wc_rev='-')})
+  tc = {}
+  tc['output'] = svntest.verify.ExpectedOutput(
+    "Resolved conflicted state of '%s'\n" % source_path, match_all=False
+  )
+  # theirs-conflict breaks the move
+  tc['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev']) 
+  tc['status'].tweak(source, status='D ')
+  tc['status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
+  working = {}
+  working['output'] = svntest.verify.ExpectedOutput(
+    "Resolved conflicted state of '%s'\n" % source_path, match_all=False
+  )
+  # XXX: working breaks the move?  Is that right?
+  working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev']) 
+  working['status'].tweak(source, status='D ')
+  working['status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
+  test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+                      'working': working}
+  test['revert_paths'] = [source_path, dest_path]
+  tests.append(test)
+
+  # move and update with incoming property modification to source (r13-14)
+  test = {}
+  test['start_rev'] = 14
+  test['end_rev'] = 15 
+  test['start_output'] = None
+  test['start_disk'] = None
+  test['start_status'] = None
+  test['up_output'] = svntest.wc.State(wc_dir, {
+    source : Item(status='  ', treeconflict='C'),
+    })
+  test['up_disk'] = svntest.main.greek_state.copy()
+  test['up_disk'].add({
+    dest: Item("This is the replaced file.\n", props={'foo': 'bar'})
+  })
+  test['up_disk'].remove(source)
+  test['up_status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+  test['up_status'].tweak(source, status='D ', moved_to=dest, treeconflict='C')
+  test['up_status'].add({dest: Item(status='A ', copied='+', wc_rev='-',
+                                    moved_from=source)})
+  mc = {}
+  mc['output'] = svntest.verify.ExpectedOutput(
+    "Resolved conflicted state of '%s'\n" % source_path, match_all=False
+  )
+  mc['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev']) 
+  mc['status'].tweak(source, status='D ', moved_to=dest)
+  mc['status'].add({dest: Item(status='A ', moved_from=source,
+                               copied='+', wc_rev='-')})
+  tc = {}
+  tc['output'] = svntest.verify.ExpectedOutput(
+    "Resolved conflicted state of '%s'\n" % source_path, match_all=False
+  )
+  # theirs-conflict breaks the move
+  tc['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev']) 
+  tc['status'].tweak(source, status='D ')
+  tc['status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
+  working = {}
+  working['output'] = svntest.verify.ExpectedOutput(
+    "Resolved conflicted state of '%s'\n" % source_path, match_all=False
+  )
+  # XXX: working breaks the move?  Is that right?
+  working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev']) 
+  working['status'].tweak(source, status='D ')
+  working['status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
+  test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+                      'working': working}
+  test['revert_paths'] = [source_path, dest_path]
+  tests.append(test)
+
+  # move and update with incoming property deletion to source (r15-16)
+  test = {}
+  test['start_rev'] = 15
+  test['end_rev'] = 16 
+  test['start_output'] = None
+  test['start_disk'] = None
+  test['start_status'] = None
+  test['up_output'] = svntest.wc.State(wc_dir, {
+    source : Item(status='  ', treeconflict='C'),
+    })
+  test['up_disk'] = svntest.main.greek_state.copy()
+  test['up_disk'].add({
+    dest: Item("This is the replaced file.\n", props={'foo': 'baz'})
+  })
+  test['up_disk'].remove(source)
+  test['up_status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+  test['up_status'].tweak(source, status='D ', moved_to=dest, treeconflict='C')
+  test['up_status'].add({dest: Item(status='A ', copied='+', wc_rev='-',
+                                    moved_from=source)})
+  mc = {}
+  mc['output'] = svntest.verify.ExpectedOutput(
+    "Resolved conflicted state of '%s'\n" % source_path, match_all=False
+  )
+  mc['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev']) 
+  mc['status'].tweak(source, status='D ', moved_to=dest)
+  mc['status'].add({dest: Item(status='A ', moved_from=source,
+                               copied='+', wc_rev='-')})
+  tc = {}
+  tc['output'] = svntest.verify.ExpectedOutput(
+    "Resolved conflicted state of '%s'\n" % source_path, match_all=False
+  )
+  # theirs-conflict breaks the move
+  tc['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev']) 
+  tc['status'].tweak(source, status='D ')
+  tc['status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
+  working = {}
+  working['output'] = svntest.verify.ExpectedOutput(
+    "Resolved conflicted state of '%s'\n" % source_path, match_all=False
+  )
+  # XXX: working breaks the move?  Is that right?
+  working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev']) 
+  working['status'].tweak(source, status='D ')
+  working['status'].add({dest: Item(status='A ', copied='+', wc_rev='-')})
+  test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+                      'working': working}
+  test['revert_paths'] = [source_path, dest_path]
+  tests.append(test)
+
+  # move and update with incoming identical move (r16-17)
+  # XXX: It'd be really nice if we actually recognized this and the wc
+  # showed no conflict at all on udpate.
+  test = {}
+  test['start_rev'] = 16
+  test['end_rev'] = 17 
+  test['start_output'] = None
+  test['start_disk'] = None
+  test['start_status'] = None
+  test['up_output'] = svntest.wc.State(wc_dir, {
+    source : Item(status='  ', treeconflict='C'),
+    dest : Item(status='  ', treeconflict='C'),
+    })
+  test['up_disk'] = svntest.main.greek_state.copy()
+  test['up_disk'].add({
+    dest: Item("This is the replaced file.\n")
+  })
+  test['up_disk'].remove(source)
+  test['up_status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+  test['up_status'].tweak(source, status='! ', treeconflict='C', wc_rev=None)
+  test['up_status'].add({dest: Item(status='R ', copied='+', wc_rev='-',
+                                    treeconflict='C')})
+  # mine-conflict and theirs-conflict don't work.
+  mc = {}
+  mc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+  mc['status'] = test['up_status']
+  tc = {}
+  tc['error'] = svntest.verify.RegexOutput(".*: .*: W155027:.*", match_all=False)
+  tc['status'] = test['up_status']
+  working = {}
+  working['output'] = svntest.verify.ExpectedOutput(
+    "Resolved conflicted state of '%s'\n" % source_path, match_all=False
+  )
+  # move is broken now
+  working['status'] = svntest.actions.get_virginal_state(wc_dir, test['end_rev'])
+  working['status'].add({dest: Item(status='R ', copied='+', wc_rev='-')})
+  working['status'].remove(source)
+  working['revert_paths'] = [dest_path]
+  test['resolves'] = {'mine-conflict': mc, 'theirs-conflict': tc,
+                      'working': working}
+  test['revert_paths'] = [dest_path, source_path]
+  tests.append(test)
+
+  return tests
+
+def build_simple_file_move_func(sbox, source, dest):
+  wc_dir = sbox.wc_dir
+  source_path = sbox.ospath(source)
+  dest_path = sbox.ospath(dest)
+
+  # Setup the move function
+  def move_func(rev):
+    # execute the move
+    svntest.actions.run_and_verify_svn(None, None, [], "move",
+                                       source_path, dest_path) 
+    if move_func.extra_mv_tests:
+      mv_status = svntest.actions.get_virginal_state(wc_dir, rev) 
+      mv_status.tweak(source, status='D ', moved_to=dest)
+      mv_status.add({dest: Item(status='A ', moved_from=source,
+                                copied='+', wc_rev='-')})
+      mv_info_src = [
+        {
+          'Path'       : re.escape(source_path),
+          'Moved To'   : re.escape(dest),
+        }
+      ]
+      mv_info_dst = [
+        {
+          'Path'       : re.escape(dest_path),
+          'Moved From' : re.escape(source),
+        }
+      ]
+
+      # check the status output.
+      svntest.actions.run_and_verify_status(wc_dir, mv_status)
+
+      # check the info output
+      svntest.actions.run_and_verify_info(mv_info_src, source_path)
+      svntest.actions.run_and_verify_info(mv_info_dst, dest_path)
+      move_func.extra_mv_tests = False
+
+  # Do the status and info tests the first time through
+  # No reason to repeat these tests for each of the variations below
+  # since the move is exactly the same.
+  move_func.extra_mv_tests = True
+
+  return move_func
+
+######################################################################
+# Tests
+#
+#   Each test must return on success or raise on failure.
+#
+# See http://wiki.apache.org/subversion/LocalMoves
+
+def lateral_move_file_test(sbox):
+  "lateral (rename) move of a file test"
+  sbox.build()
+
+  # Plan to test moving A/B/lambda to A/B/lambda-moved
+  source = 'A/B/lambda'
+  dest = 'A/B/lambda-moved'
+
+  # Build the revisions to do the updates via
+  build_incoming_changes_file(sbox, source, dest)
+
+  # Get function to implement the actual move
+  move_func = build_simple_file_move_func(sbox, source, dest)
+
+  # Get the test plan
+  tests = build_simple_file_move_tests(sbox, source, dest)
+
+  # Actually run the tests
+  move_file_tests(sbox, source, dest, move_func, tests)
+
+def sibling_move_file_test(sbox):
+  "sibling move of a file test"
+  sbox.build()
+
+  # Plan to test moving A/B/lambda to A/C/lambda
+  source = 'A/B/lambda'
+  dest = 'A/C/lambda'
+
+  # Build the revisions to do the updates via
+  build_incoming_changes_file(sbox, source, dest)
+
+  # Get function to implement the actual move
+  move_func = build_simple_file_move_func(sbox, source, dest)
+
+  # Get the test plan
+  tests = build_simple_file_move_tests(sbox, source, dest)
+
+  # Actually run the tests
+  move_file_tests(sbox, source, dest, move_func, tests)
+
+def shallower_move_file_test(sbox):
+  "shallower move of a file test"
+  sbox.build()
+
+  # Plan to test moving A/B/lambda to A/lambda
+  source = 'A/B/lambda'
+  dest = 'A/lambda'
+
+  # Build the revisions to do the updates via
+  build_incoming_changes_file(sbox, source, dest)
+
+  # Get function to implement the actual move
+  move_func = build_simple_file_move_func(sbox, source, dest)
+
+  # Get the test plan
+  tests = build_simple_file_move_tests(sbox, source, dest)
+
+  # Actually run the tests
+  move_file_tests(sbox, source, dest, move_func, tests)
+
+def deeper_move_file_test(sbox):
+  "deeper move of a file test"
+  sbox.build()
+
+  # Plan to test moving A/B/lambda to A/B/F/lambda
+  source = 'A/B/lambda'
+  dest = 'A/B/F/lambda'
+
+  # Build the revisions to do the updates via
+  build_incoming_changes_file(sbox, source, dest)
+
+  # Get function to implement the actual move
+  move_func = build_simple_file_move_func(sbox, source, dest)
+
+  # Get the test plan
+  tests = build_simple_file_move_tests(sbox, source, dest)
+
+  # Actually run the tests
+  move_file_tests(sbox, source, dest, move_func, tests)
+
+
+
+#######################################################################
+# Run the tests
+
+# list all tests here, starting with None:
+test_list = [ None,
+              lateral_move_file_test,
+              sibling_move_file_test,
+              shallower_move_file_test,
+              deeper_move_file_test,
+            ]
+
+if __name__ == '__main__':
+  svntest.main.run_tests(test_list)
+  # NOTREACHED
+
+
+### End of file.

Propchange: subversion/trunk/subversion/tests/cmdline/move_tests.py
------------------------------------------------------------------------------
    svn:executable = *



Mime
View raw message