You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ka...@apache.org on 2010/12/31 12:07:08 UTC

svn commit: r1054090 - in /subversion/trunk/subversion/tests/cmdline: upgrade_tests.py upgrade_tests_data/upgrade_with_scheduled_change.tar.bz2

Author: kameshj
Date: Fri Dec 31 11:07:08 2010
New Revision: 1054090

URL: http://svn.apache.org/viewvc?rev=1054090&view=rev
Log:
Adds an XFail test of wc-upgrade(1.6-wc+scheduled_change to 1.7-wc).

* subversion/tests/cmdline/upgrade_tests_data/upgrade_with_scheduled_change.tar.bz2
  New file.

* subversion/tests/cmdline/upgrade_tests.py
  (upgrade_with_scheduled_change): New XFail testcase.

Patch by: Arwin Arni <arwin{_AT_}collab.net>

Added:
    subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_with_scheduled_change.tar.bz2   (with props)
Modified:
    subversion/trunk/subversion/tests/cmdline/upgrade_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1054090&r1=1054089&r2=1054090&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Fri Dec 31 11:07:08 2010
@@ -831,6 +831,16 @@ def replaced_files(sbox):
       [sbox.ospath('B/f'), '958eb2d755df2d9e0de6f7b835aec16b64d83f6f'],
       [sbox.ospath('B/g'), '395dfb603d8a4e0348d0b082803f2b7426c76eb9']])
 
+def upgrade_with_scheduled_change(sbox):
+  "upgrade 1.6.x wc with a scheduled change"
+  
+  sbox.build(create_wc = False)
+  replace_sbox_with_tarfile(sbox, 'upgrade_with_scheduled_change.tar.bz2')
+
+  svntest.actions.run_and_verify_svn(None, None, [],
+                                     'upgrade', sbox.wc_dir)
+  
+   
 ########################################################################
 # Run the tests
 
@@ -855,6 +865,7 @@ test_list = [ None,
               upgrade_tree_conflict_data,
               delete_in_copy_upgrade,
               replaced_files,
+              XFail(upgrade_with_scheduled_change),
              ]
 
 

Added: subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_with_scheduled_change.tar.bz2
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_with_scheduled_change.tar.bz2?rev=1054090&view=auto
==============================================================================
Binary file - no diff available.

Propchange: subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_with_scheduled_change.tar.bz2
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream