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

Re: svn commit: r1002313 - /subversion/trunk/subversion/tests/cmdline/prop_tests.py

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Tue, 28 Sep 2010 21:30:59 +0200

pburba_at_apache.org wrote on Tue, Sep 28, 2010 at 18:38:19 -0000:
> + # Run propget -vR svn:mergeinfo and collect the stdout.
> + exit_code, pg_stdout, pg_stderr = svntest.actions.run_and_verify_svn(
> + None, None, [], 'propget', SVN_PROP_MERGEINFO, '-vR', wc_dir)
> +

exit_code and pg_stderr aren't checked anywhere.

> + # Run propget -vR svn:mergeinfo, redirecting the stdout to a file.
> + arglist = ['svn.exe', 'propget', SVN_PROP_MERGEINFO, '-vR', wc_dir]

s/.exe// ?

> + redir_file = open(redirect_file, 'wb')
> + pg_proc = subprocess.Popen(arglist, stdout=redir_file)

Shouldn't this use the svntest/ infrastructure? Compare
svntest.actions.check_prop().

> + pg_proc.wait()
> + redir_file.close()
> + pg_stdout_redir = open(redirect_file, 'r').readlines()
> +
> + # Check if the redirected output of svn pg -vR is what we expect.
> + #
> + # Currently this fails because the mergeinfo for the three paths is
> + # interleaved and the lines endings are (at least on Windows) a mix
> + # of <CR><LF> and <LF>. See
> + # http://subversion.tigris.org/issues/show_bug.cgi?id=3721#desc1
> + unordered_expected_output = svntest.verify.UnorderedOutput([
> + "Properties on '" + B_path + "':\n",
> + "Properties on '" + C_path + "':\n",
> + "Properties on '" + D_path + "':\n",
> + " svn:mergeinfo\n",
> + " /subversion/branches/1.5.x:872364-874936\n",
> + " /subversion/branches/1.5.x-34184:874657-874741\n",
> + " /subversion/branches/1.5.x-34432:874744-874798\n",

So, 'unordered' also ignores repetitions? (since the last 4 lines
appear only once each, rather than three times each)
Received on 2010-09-28 21:32:23 CEST

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