[[[
Since the standard Ruby unit test framework has no ability to mark a test as
"XFail," just remove it until it can pass again. Include a request to restore
the test when it should pass again....
* subversion/bindings/swig/ruby/test/test_client.rb
(SvnClientTest#test_mkdir_p): Comment out
* subversion/tests/cmdline/basic_tests.py
(test_list): Annotate the "Wimp" test for basic_mkdir_wc_with_parents with
a request to uncomment the Ruby test when functionality is restored.
]]]
Index: subversion/bindings/swig/ruby/test/test_client.rb
===================================================================
--- subversion/bindings/swig/ruby/test/test_client.rb (revision 889879)
+++ subversion/bindings/swig/ruby/test/test_client.rb (working copy)
@@ -211,38 +211,38 @@
end
end
- def test_mkdir_p
- log = "sample log"
- dir = "parent"
- child_dir = "parent/child"
- dir_path = Pathname.new(@wc_path) + dir
- child_dir_path = dir_path + "child"
- full_paths = [dir_path, child_dir_path].collect {|path| path.expand_path}
+# def test_mkdir_p
+# log = "sample log"
+# dir = "parent"
+# child_dir = "parent/child"
+# dir_path = Pathname.new(@wc_path) + dir
+# child_dir_path = dir_path + "child"
+# full_paths = [dir_path, child_dir_path].collect {|path| path.expand_path}
+#
+# make_context(log) do |ctx|
+#
+# infos = []
+# ctx.set_notify_func do |notify|
+# infos << [notify.path, notify]
+# end
+#
+# assert_equal([false, false], [dir_path.exist?, child_dir_path.exist?])
+# ctx.mkdir_p(child_dir_path.to_s)
+# assert_equal(full_paths.collect {|path| path.to_s}.sort,
+# infos.collect{|path, notify| path}.sort)
+# assert_equal([true, true],
+# infos.collect{|path, notify| notify.add?})
+# assert_equal([true, true], [dir_path.exist?, child_dir_path.exist?])
+#
+# infos.clear
+# ctx.commit(@wc_path)
+# assert_equal(full_paths.collect {|path| path.to_s}.sort,
+# infos.collect{|path, notify| path}.sort)
+# assert_equal([true, true],
+# infos.collect{|path, notify| notify.commit_added?})
+# end
+# end
- make_context(log) do |ctx|
-
- infos = []
- ctx.set_notify_func do |notify|
- infos << [notify.path, notify]
- end
-
- assert_equal([false, false], [dir_path.exist?, child_dir_path.exist?])
- ctx.mkdir_p(child_dir_path.to_s)
- assert_equal(full_paths.collect {|path| path.to_s}.sort,
- infos.collect{|path, notify| path}.sort)
- assert_equal([true, true],
- infos.collect{|path, notify| notify.add?})
- assert_equal([true, true], [dir_path.exist?, child_dir_path.exist?])
-
- infos.clear
- ctx.commit(@wc_path)
- assert_equal(full_paths.collect {|path| path.to_s}.sort,
- infos.collect{|path, notify| path}.sort)
- assert_equal([true, true],
- infos.collect{|path, notify| notify.commit_added?})
- end
- end
-
def test_delete
log = "sample log"
src = "sample source\n"
Index: subversion/tests/cmdline/basic_tests.py
===================================================================
--- subversion/tests/cmdline/basic_tests.py (revision 889879)
+++ subversion/tests/cmdline/basic_tests.py (working copy)
@@ -2491,6 +2491,9 @@
basic_update,
basic_mkdir_url,
basic_mkdir_url_with_parents,
+ # Please uncomment the test_mkdir_p test in
+ # subversion/bindings/swig/ruby/test/test_client.rb
+ # when un"Wimp"ing this test
Wimp("currently, WC locks are being left behind",
basic_mkdir_wc_with_parents),
basic_corruption,
