[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r16202 - branches/wc-replacements/subversion/tests/clients/cmdline

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: 2005-09-22 22:40:21 CEST

Hi Ivan!

On 9/22/05, zhakov@tigris.org <zhakov@tigris.org> wrote:
> Author: zhakov
> Date: Thu Sep 22 04:32:37 2005
> New Revision: 16202
>
> Modified:
> branches/wc-replacements/subversion/tests/clients/cmdline/copy_tests.py
>
> Log:
> Add test for delete replaced file.
>
> * subversion/tests/clients/cmdline/copy_tests.py
> (delete_replaced_file): New test for delete replaced file.
> (test_list): Add new test delete_replaced_file and mark it with XFail.

Any reason why you didn't add this to delete_tests.py?

Though, I'm starting to think we need a new tests file which holds all
replacement tests....

> Modified: branches/wc-replacements/subversion/tests/clients/cmdline/copy_tests.py
> Url: http://svn.collab.net/viewcvs/svn/branches/wc-replacements/subversion/tests/clients/cmdline/copy_tests.py?rev=16202&p1=branches/wc-replacements/subversion/tests/clients/cmdline/copy_tests.py&p2=branches/wc-replacements/subversion/tests/clients/cmdline/copy_tests.py&r1=16201&r2=16202
> ==============================================================================
> --- branches/wc-replacements/subversion/tests/clients/cmdline/copy_tests.py (original)
> +++ branches/wc-replacements/subversion/tests/clients/cmdline/copy_tests.py Thu Sep 22 04:32:37 2005
> @@ -1791,6 +1791,39 @@
>
> copy_replace_with_props(sbox, False)
>
> +def delete_replaced_file(sbox):
> + "delete file scheduled for replace"
> +
> + sbox.build()
> + wc_dir = sbox.wc_dir
> +
> + # File scheduled for deletion.
> + rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
> + svntest.actions.run_and_verify_svn(None, None, [], 'rm', rho_path)
> +
> + # Status before attempting copies
> + expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
> + expected_status.tweak('A/D/G/rho', status='D ')
> + svntest.actions.run_and_verify_status(wc_dir, expected_status)
> +
> + # Copy 'pi' over 'rho' with history.
> + pi_src = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
> + svntest.actions.run_and_verify_svn("", None, [], 'cp', pi_src, rho_path)
> +
> + # Check that file copied.
> + expected_status.tweak('A/D/G/rho', status='R ', copied='+', wc_rev='-')
> + svntest.actions.run_and_verify_status(wc_dir, expected_status)
> +
> + # Now delete replaced file.
> + svntest.actions.run_and_verify_svn(None, None, [], 'rm',
> + '--force', rho_path)
> +
> + # Verify status after deletion.
> + expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
> + expected_status.tweak('A/D/G/rho', status='D ')
> + svntest.actions.run_and_verify_status(wc_dir, expected_status)
> +
> +
> ########################################################################
> # Run the tests
>
> @@ -1831,6 +1864,7 @@
> wc_copy_replace_with_props,
> repos_to_wc_copy_replacement,
> repos_to_wc_copy_replace_with_props,
> + XFail(delete_replaced_file),
> ]
>
> if __name__ == '__main__':

Nice to see more tests added.

bye,

Erik.
Received on Thu Sep 22 22:41:14 2005

This is an archived mail posted to the Subversion Dev mailing list.