Author: pburba
Date: Tue Dec 8 16:48:15 2009
New Revision: 888479
URL: http://svn.apache.org/viewvc?rev=888479&view=rev
Log:
Add a test for issue #3461 'excluded subtrees are not detected by
svnversion'.
* subversion/tests/cmdline/svnversion_tests.py
(svnversion_with_excluded_subtrees):
(test_list): Add XFailing svnversion_with_excluded_subtrees.
Modified:
subversion/trunk/subversion/tests/cmdline/svnversion_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/svnversion_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnversion_tests.py?rev=888479&r1=888478&r2=888479&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnversion_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnversion_tests.py Tue Dec 8
16:48:15 2009
@@ -204,6 +204,42 @@
wc_dir, repo_url,
[ "2\n" ], [])
+#----------------------------------------------------------------------
+
+# Test for issue #3461 'excluded subtrees are not detected by svnversion'
+#
+# Marked as XFail until svnversion detects excluded subtrees,
+# i.e. issue #3461 is fixed.
+def svnversion_with_excluded_subtrees(sbox):
+ "test 'svnversion' with excluded subtrees"
+ sbox.build()
+ wc_dir = sbox.wc_dir
+ repo_url = sbox.repo_url
+
+ B_path = os.path.join(wc_dir, "A", "B")
+ D_path = os.path.join(wc_dir, "A", "D")
+ psi_path = os.path.join(wc_dir, "A", "D", "H", "psi")
+
+ svntest.actions.run_and_verify_svnversion("working copy with excluded dir",
+ wc_dir, repo_url,
+ [ "1\n" ], [])
+
+ # Exclude a directory and check that svnversion detects it.
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'up', '--set-depth', 'exclude', B_path)
+ svntest.actions.run_and_verify_svnversion("working copy with excluded dir",
+ wc_dir, repo_url,
+ [ "1P\n" ], [])
+
+ # Exclude a file and check that svnversion detects it. Target the
+ # svnversion command on a subtree that does not contain the excluded
+ # directory to assure we a detecting the switched file.
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'up', '--set-depth', 'exclude', psi_path)
+ svntest.actions.run_and_verify_svnversion("working copy with excluded file",
+ D_path, repo_url + '/A/D',
+ [ "1P\n" ], [])
+
########################################################################
# Run the tests
@@ -212,6 +248,7 @@
test_list = [ None,
svnversion_test,
ignore_externals,
+ XFail(svnversion_with_excluded_subtrees),
]
if __name__ == '__main__':
