Project: Subversion

Revision: 32954

Author: kfogel

Date: 06 Sep 2008 22:27:58

• /trunk/subversion/tests/cmdline/prop_tests.py

  ......	@@ -1655,6 +1655,31 @@
  1655	1655	'svn:date', 'Sat May 10 12:12:31 2008',
  1656	1656	repo_url)
  1657	1657
  	1658	def same_replacement_props(sbox):
  	1659	"commit replacement props when same as old props"
  	1660	# issue #3282
  	1661	sbox.build()
  	1662	foo_path = os.path.join(sbox.wc_dir, 'foo')
  	1663	open(foo_path, 'w').close()
  	1664	svntest.main.run_svn(None, 'add', foo_path)
  	1665	svntest.main.run_svn(None, 'propset', 'someprop', 'someval', foo_path)
  	1666	svntest.main.run_svn(None, 'ci', '-m', 'commit first foo', foo_path)
  	1667	svntest.main.run_svn(None, 'rm', foo_path)
  	1668	# Now replace 'foo'.
  	1669	open(foo_path, 'w').close()
  	1670	svntest.main.run_svn(None, 'add', foo_path)
  	1671	# Set the same property again, with the same value.
  	1672	svntest.main.run_svn(None, 'propset', 'someprop', 'someval', foo_path)
  	1673	svntest.main.run_svn(None, 'ci', '-m', 'commit second foo', foo_path)
  	1674	# Check if the property made it into the repository.
  	1675	foo_url = sbox.repo_url + '/foo'
  	1676	expected_out = [ "Properties on '" + foo_url + "':\n",
  	1677	" someprop\n",
  	1678	" someval\n" ]
  	1679	svntest.actions.run_and_verify_svn(None, expected_out, [],
  	1680	'proplist', '-v', foo_url)
  	1681
  	1682
  1658	1683	########################################################################
  1659	1684	# Run the tests
  1660	1685
  ......	@@ -1691,6 +1716,7 @@
  1691	1716	# XFail the same reason revprop_change() is.
  1692	1717	SkipUnless(XFail(invalid_propvalues, svntest.main.is_ra_type_dav),
  1693	1718	svntest.main.server_enforces_date_syntax),
  	1719	same_replacement_props,
  1694	1720	]
  1695	1721
  1696	1722	if __name__ == '__main__':