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

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

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Tue, 21 Oct 2008 01:48:32 +0200

On Mon, 20 Oct 2008 15:54:05 -0700, rhuijben_at_tigris.org said:
> Author: rhuijben
> Date: Mon Oct 20 15:54:05 2008
> New Revision: 33790
>
> --- trunk/subversion/tests/cmdline/merge_tests.py Mon Oct 20 14:32:18 2008 (r33789)
> +++ trunk/subversion/tests/cmdline/merge_tests.py Mon Oct 20 15:54:05 2008 (r33790)
> @@ -2885,8 +2885,23 @@ def merge_file_with_space_in_its_name(sb
> def merge_dir_branches(sbox):
> "merge between branches (Issue #2222)"
>
> + def get_wc_uuid(wc_dir):
> + "Return the UUID of the working copy at WC_DIR."
> +
> + exit_code, output, errput = svntest.main.run_svn(None, 'info', wc_dir)
> + if errput:
> + raise svntest.verify.SVNUnexpectedStderr(errput)
> +
> + for line in output:
> + if line.startswith('Repository UUID:'):
> + return line[17:].rstrip()
> +
> + # No 'Repository UUID' line in 'svn info'?
> + raise svntest.verify.SVNUnexpectedStdout(output)

Plagiarist. :-) This function is word-for-word identical to the
function I wrote in update_uuid_changed() in update_tests.py (there it
is called 'wc_uuid'). Can't we get rid of the code duplication?
(Perhaps even parse the 'svn info' output into a dict in the process?)

Daniel

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-21 01:48:48 CEST

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