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

[Greg Stein <gs...@gmail.com>]

Maybe generalize that function, to be used by other parts of the test suite?

(maybe it exists already?)

On Mon, Oct 20, 2008 at 3:54 PM,  <rh...@tigris.org> wrote:
> Author: rhuijben
> Date: Mon Oct 20 15:54:05 2008
> New Revision: 33790
>
> Log:
> * subversion/tests/cmdline/merge_tests.py
>  (merge_dir_branches): Retrieve the uuid from the working copy root and
>    place this as uuid in the expected svn info output.
>
> Modified:
>   trunk/subversion/tests/cmdline/merge_tests.py
>
> Modified: trunk/subversion/tests/cmdline/merge_tests.py
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/merge_tests.py?pathrev=33790&r1=33789&r2=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)
> +
>   sbox.build()
>   wc_dir = sbox.wc_dir
> +  wc_uuid = get_wc_uuid(wc_dir)
>
>   F_path = os.path.join(wc_dir, 'A', 'B', 'F')
>   F_url = sbox.repo_url + '/A/B/F'
> @@ -2924,7 +2939,7 @@ def merge_dir_branches(sbox):
>   expected_output = ["Path: " + foo_path + "\n",
>                      "URL: " + sbox.repo_url + "/foo\n",
>                      "Repository Root: " + sbox.repo_url + "\n",
> -                     "Repository UUID: .*\n",
> +                     "Repository UUID: %s\n" % wc_uuid,
>                      "Revision: 2\n",
>                      "Node Kind: directory\n",
>                      "Schedule: add\n",
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org
>
>

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