Re: svn commit: r24663 - trunk/subversion/tests/cmdline

lgo@tigris.org wrote:
> Author: lgo
> Date: Thu Apr 19 12:05:09 2007
> New Revision: 24663
>
> Log:
> Add a new test for update --depth: depth_mixed_bring_in_dir
>
> * subversion/tests/cmdline/depth_tests.py
> (depth_mixed_bring_in_dir):add the body of the test stub.
>
>
> Modified:
> trunk/subversion/tests/cmdline/depth_tests.py
>
> Modified: trunk/subversion/tests/cmdline/depth_tests.py
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/depth_tests.py?pathrev=24663&r1=24662&r2=24663
> ==============================================================================
> --- trunk/subversion/tests/cmdline/depth_tests.py (original)
> +++ trunk/subversion/tests/cmdline/depth_tests.py Thu Apr 19 12:05:09 2007
> @@ -413,9 +413,61 @@
> #----------------------------------------------------------------------
> def depth_mixed_bring_in_dir(sbox):
> "bring a dir into a mixed-depth working copy"
> +
> # Run 'svn up --depth=immediates A' in a depth-empty working copy.
> + wc_empty, ign_a, ign_b, wc = set_up_depthy_working_copies(sbox, empty=True)
> + A_path = os.path.join(wc_empty, 'A')
> +
> + expected_output = svntest.wc.State(wc_empty, {
> + 'A' : Item(status='A '),
> + 'A/mu' : Item(status='A '),
> + 'A/B' : Item(status='A '),
> + 'A/C' : Item(status='A '),
> + 'A/D' : Item(status='A '),
> + })
> + expected_disk = svntest.main.greek_state.copy()
> + expected_disk.remove('iota', 'A/B/lambda', 'A/B/E', 'A/B/E/alpha',
> + 'A/B/E/beta', 'A/B/F', 'A/D/gamma', 'A/D/G',
> + 'A/D/G/pi', 'A/D/G/rho', 'A/D/G/tau', 'A/D/H',
> + 'A/D/H/chi', 'A/D/H/psi', 'A/D/H/omega')
> + expected_status = svntest.actions.get_virginal_state(wc_empty, 1)
> + expected_status.remove('iota', 'A/B/lambda', 'A/B/E', 'A/B/E/alpha',
> + 'A/B/E/beta', 'A/B/F', 'A/D/gamma', 'A/D/G',
> + 'A/D/G/pi', 'A/D/G/rho', 'A/D/G/tau', 'A/D/H',
> + 'A/D/H/chi', 'A/D/H/psi', 'A/D/H/omega')
> + svntest.actions.run_and_verify_update(wc_empty,
> + expected_output,
> + expected_disk,
> + expected_status,
> + None, None,
> + None, None, None, None,
> + '--depth', 'immediates',
> + A_path)
> +
> # Then run 'svn up A/B' to fill out B.
> - raise svntest.Failure("<test not yet written>")
> + B_path = os.path.join(A_path, 'B')
> + expected_output = svntest.wc.State(wc_empty, {
> + 'A/B/lambda' : Item(status='A '),
> + 'A/B/E' : Item(status='A '),
> + 'A/B/E/alpha' : Item(status='A '),
> + 'A/B/E/beta' : Item(status='A '),
> + 'A/B/F' : Item(status='A '),
> + })
> + expected_disk = svntest.main.greek_state.copy()
> + expected_disk.remove('iota', 'A/D/gamma', 'A/D/G',
> + 'A/D/G/pi', 'A/D/G/rho', 'A/D/G/tau', 'A/D/H',
> + 'A/D/H/chi', 'A/D/H/psi', 'A/D/H/omega')
> + expected_status = svntest.actions.get_virginal_state(wc_empty, 1)
> + expected_status.remove('iota', 'A/D/gamma', 'A/D/G',
> + 'A/D/G/pi', 'A/D/G/rho', 'A/D/G/tau', 'A/D/H',
> + 'A/D/H/chi', 'A/D/H/psi', 'A/D/H/omega')
> + svntest.actions.run_and_verify_update(wc_empty,
> + expected_output,
> + expected_disk,
> + expected_status,
> + None, None,
> + None, None, None, None,
> + B_path)
>

Hi Lieven,

Is it OK if I delete the second part of this test (the one that tries to
fill out A/B/)? It does essentially the same thing as the
depth_immediates_fill_in_dir() test you added in r24706, and the failure
is actually caused by the first part.

The reason I'm asking is that I have a working fix for the first part,
and I'd like to cut down on the number of XFails.

-- 
Vlad
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org