Rev 1382: use commit editor in some places in tree tests. in http://people.samba.org/bzr/jelmer/bzr-svn/0.4

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/0.4

------------------------------------------------------------
revno: 1382
revision-id: jelmer at samba.org-20080627185607-554l1oh62x0g3spq
parent: jelmer at samba.org-20080627184340-9f9p6ml8qgv4shb3
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-06-27 20:56:07 +0200
message:
  use commit editor in some places in tree tests.
modified:
  tests/test_tree.py             test_tree.py-20070103204350-pr8nupes7e5sd2wr-1
=== modified file 'tests/test_tree.py'
--- a/tests/test_tree.py	2008-06-23 02:56:49 +0000
+++ b/tests/test_tree.py	2008-06-27 18:56:07 +0000
@@ -56,13 +56,14 @@
         self.assertFalse(tree.inventory[tree.inventory.path2id("file")].executable)
 
     def test_symlink(self):
-        if not has_symlinks():
-            return
-        self.make_client("d", "dc")
-        os.symlink("target", "dc/file")
-        self.build_tree({"dc/file": "x"})
-        self.client_add("dc/file")
-        self.client_commit("dc", "symlink")
+        repos_url = self.make_client("d", "dc")
+
+        dc = self.get_commit_editor(repos_url)
+        file = dc.add_file("file")
+        file.modify("link target")
+        file.change_prop("svn:special", "*")
+        dc.close()
+
         self.client_update("dc")
         tree = SvnBasisTree(self.open_checkout("dc"))
         self.assertEqual('symlink', 
@@ -71,17 +72,21 @@
                          tree.inventory[tree.inventory.path2id("file")].symlink_target)
 
     def test_symlink_next(self):
-        if not has_symlinks():
-            return
-        self.make_client("d", "dc")
-        os.symlink("target", "dc/file")
-        self.build_tree({"dc/file": "x", "dc/bla": "p"})
-        self.client_add("dc/file")
-        self.client_add("dc/bla")
-        self.client_commit("dc", "symlink")
-        self.build_tree({"dc/bla": "pa"})
-        self.client_commit("dc", "change")
+        repos_url = self.make_client("d", "dc")
+
+        dc = self.get_commit_editor(repos_url)
+        dc.add_file("bla").modify("p")
+        file = dc.add_file("file")
+        file.modify("link target")
+        file.change_prop("svn:special", "*")
+        dc.close()
+
+        dc = self.get_commit_editor(repos_url)
+        dc.open_file("bla").modify("pa")
+        dc.close()
+
         self.client_update("dc")
+
         tree = SvnBasisTree(self.open_checkout("dc"))
         self.assertEqual('symlink', 
                          tree.inventory[tree.inventory.path2id("file")].kind)
@@ -89,13 +94,17 @@
                          tree.inventory[tree.inventory.path2id("file")].symlink_target)
 
     def test_annotate_iter(self):
-        self.make_client("d", "dc")
-        self.build_tree({"dc/file": "x\n"})
-        self.client_add("dc/file")
-        self.client_commit("dc", "change")
-        self.client_update("dc")
-        self.build_tree({"dc/file": "x\n\y\n"})
-        self.client_commit("dc", "change")
+        repos_url = self.make_client("d", "dc")
+
+        dc = self.get_commit_editor(repos_url)
+        dc.add_file("file").modify("x\n")
+        dc.close()
+
+        dc = self.get_commit_editor(repos_url)
+        dc.open_file("file").modify("x\ny\n")
+        dc.close()
+
+        self.client_update('dc')
         tree = SvnBasisTree(self.open_checkout("dc"))
         self.assertRaises(NotImplementedError, tree.annotate_iter, tree.path2id("file"))