svn commit: r979099 - /subversion/branches/atomic-revprop/subversion/tests/cmdline/svntest/actions.py

[da...@apache.org]

Author: danielsh
Date: Sun Jul 25 19:38:57 2010
New Revision: 979099

URL: http://svn.apache.org/viewvc?rev=979099&view=rev
Log:
Extend an API in the Python test framework.

* subversion/tests/cmdline/svntest/actions.py
  (check_prop):
    Add a REVPROP parameter and support for checking revision properties.

Modified:
    subversion/branches/atomic-revprop/subversion/tests/cmdline/svntest/actions.py

Modified: subversion/branches/atomic-revprop/subversion/tests/cmdline/svntest/actions.py
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/tests/cmdline/svntest/actions.py?rev=979099&r1=979098&r2=979099&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/tests/cmdline/svntest/actions.py (original)
+++ subversion/branches/atomic-revprop/subversion/tests/cmdline/svntest/actions.py Sun Jul 25 19:38:57 2010
@@ -1742,15 +1742,22 @@ def set_prop(name, value, path, expected
   else:
     main.run_svn(expected_err, 'propset', name, value, path)
 
-def check_prop(name, path, exp_out):
-  """Verify that property NAME on PATH has a value of EXP_OUT"""
+def check_prop(name, path, exp_out, revprop=None):
+  """Verify that property NAME on PATH has a value of EXP_OUT.
+  If REVPROP is not None, then it is a revision number and
+  a revision property is sought."""
+  if revprop is not None:
+    revprop_options = ['--revprop', '-r', revprop]
+  else:
+    revprop_options = []
   # Not using run_svn because binary_mode must be set
   exit_code, out, err = main.run_command(main.svn_binary, None, 1, 'pg',
                                          '--strict', name, path,
                                          '--config-dir',
                                          main.default_config_dir,
                                          '--username', main.wc_author,
-                                         '--password', main.wc_passwd)
+                                         '--password', main.wc_passwd,
+                                         *revprop_options)
   if out != exp_out:
     print("svn pg --strict %s output does not match expected." % name)
     print("Expected standard output:  %s\n" % exp_out)