svn commit: r956633 - /subversion/branches/1.6.x-issue3242-reintegrate/subversion/tests/cmdline/merge_authz_tests.py

[pb...@apache.org]

Author: pburba
Date: Mon Jun 21 16:13:20 2010
New Revision: 956633

URL: http://svn.apache.org/viewvc?rev=956633&view=rev
Log:
On the 1.6.x-issue3242-reintegrate branch: Fix up merge_authz test to work
on 1.6.x.

* subversion/tests/cmdline/merge_authz_tests.py

  (merge_tests.expected_merge_output,
   svntest.main.is_ra_type_dav,
   svntest.main.is_ra_type_svn): Import.

  (reintegrate_fails_if_no_root_access): Remove expected_mergeinfo_output
   and expected_elision_output, those are trunk/1.7+.  Remove args from
   svntest.actions.run_and_verify_merge() call which don't exist on 1.6.x.


Modified:
    subversion/branches/1.6.x-issue3242-reintegrate/subversion/tests/cmdline/merge_authz_tests.py

Modified: subversion/branches/1.6.x-issue3242-reintegrate/subversion/tests/cmdline/merge_authz_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x-issue3242-reintegrate/subversion/tests/cmdline/merge_authz_tests.py?rev=956633&r1=956632&r2=956633&view=diff
==============================================================================
--- subversion/branches/1.6.x-issue3242-reintegrate/subversion/tests/cmdline/merge_authz_tests.py (original)
+++ subversion/branches/1.6.x-issue3242-reintegrate/subversion/tests/cmdline/merge_authz_tests.py Mon Jun 21 16:13:20 2010
@@ -31,7 +31,10 @@ Skip = svntest.testcase.Skip
 SkipUnless = svntest.testcase.SkipUnless
 
 from merge_tests import set_up_branch
+from merge_tests import expected_merge_output
 
+from svntest.main import is_ra_type_dav
+from svntest.main import is_ra_type_svn
 from svntest.main import SVN_PROP_MERGEINFO
 from svntest.main import write_restrictive_svnserve_conf
 from svntest.main import write_authz_file
@@ -488,11 +491,6 @@ def reintegrate_fails_if_no_root_access(
   expected_output = wc.State(A_path, {
     'mu'           : Item(status='U '),
     })
-  expected_mergeinfo_output = wc.State(A_path, {
-    '' : Item(status=' G'),
-    })
-  expected_elision_output = wc.State(A_path, {
-    })
   expected_disk = wc.State('', {
     ''          : Item(props={SVN_PROP_MERGEINFO : '/A_COPY:2-8'}),
     'B'         : Item(),
@@ -537,10 +535,8 @@ def reintegrate_fails_if_no_root_access(
   })
   expected_skip = wc.State(A_path, {})
   svntest.actions.run_and_verify_merge(A_path, None, None,
-                                       sbox.repo_url + '/A_COPY', None,
+                                       sbox.repo_url + '/A_COPY',
                                        expected_output,
-                                       expected_mergeinfo_output,
-                                       expected_elision_output,
                                        expected_disk,
                                        expected_status,
                                        expected_skip,