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

[rh...@apache.org]

Author: rhuijben
Date: Thu Mar  4 08:13:49 2010
New Revision: 918886

URL: http://svn.apache.org/viewvc?rev=918886&view=rev
Log:
After playing with Subversion 1.0.0 for a while, add the resulting
working copy as a testcase for upgrading to WC-NG from a xml entries file.

Currently this test is marked as XFail, because some constraints fail
while upgrading. The test needs a bit of enhancement after the upgrade
part is working.

* tests/cmdline/upgrade_tests.py
  (basic_upgrade_1_0): New function.
  (test_list): Add basic_upgrade_1_0 as XFail.
  
* tests/cmdline/upgrade_tests_data/upgrade_1_0.tar.bz2
  New test working copy (format 4).

Added:
    subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_1_0.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=918886&r1=918885&r2=918886&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Thu Mar  4 08:13:49 2010
@@ -210,6 +210,29 @@
     '(svn:wc:ra_dav:version-url 46 /svn-test-work/local_tmp/repos/!svn/ver/1/iota)',
   }
   check_dav_cache(sbox.wc_dir, 1, expected_dav_caches)
+  
+def basic_upgrade_1_0(sbox):
+  "test upgrading a working copy created with 1.0.0"
+  replace_sbox_with_tarfile(sbox, 'upgrade_1_0.tar.bz2')
+
+  # Attempt to use the working copy, this should give an error
+  expected_stderr = wc_is_too_old_regex
+  svntest.actions.run_and_verify_svn(None, None, expected_stderr,
+                                     'info', sbox.wc_dir)
+
+
+  # Now upgrade the working copy
+  svntest.actions.run_and_verify_svn(None, None, [],
+                                     'upgrade', sbox.wc_dir)
+
+  # Actually check the format number of the upgraded working copy
+  check_format(sbox, get_current_format())
+
+  # Now check the contents of the working copy
+  # #### This working copy is not just a basic tree,
+  #      fix with the right data once we get here
+  #expected_status = svntest.actions.get_virginal_state(sbox.wc_dir, 1)
+  #run_and_verify_status_no_server(sbox.wc_dir, expected_status)
 
 
 ########################################################################
@@ -222,6 +245,7 @@
               XFail(update_1_5),
               logs_left_1_5,
               upgrade_wcprops,
+              XFail(basic_upgrade_1_0)
              ]
 
 

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

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