Rev 1636: Fix some more tests. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1636
revision-id: jelmer at samba.org-20080824152946-bk9de0aqgckgjdrt
parent: jelmer at samba.org-20080824152240-o63u79rsvoroslhy
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-08-24 17:29:46 +0200
message:
  Fix some more tests.
modified:
  mapping3/__init__.py           __init__.py-20080502174630-9324zh25kka98vlw-1
  tests/test_branch.py           test_branch.py-20060508162215-74ffeb5d608f8e20
  tests/test_scheme.py           test_scheme.py-20060621221855-va2xabhlxpmc9llx-1
=== modified file 'mapping3/__init__.py'
--- a/mapping3/__init__.py	2008-08-24 15:01:24 +0000
+++ b/mapping3/__init__.py	2008-08-24 15:29:46 +0000
@@ -360,7 +360,7 @@
 
 class BzrSvnMappingv3RevProps(mapping.BzrSvnMappingRevProps, BzrSvnMappingv3):
     def export_revision(self, can_use_custom_revprops, branch_root, timestamp, timezone, committer, revprops, revision_id, revno, merges, fileprops):
-        (revprops, fileprops) = BzrSvnMappingRevProps.export_revision(self, can_use_custom_revprops, branch_root, timestamp, timezone, committer, revprops, revision_id, revno, merges, fileprops)
+        (revprops, fileprops) = mapping.BzrSvnMappingRevProps.export_revision(self, can_use_custom_revprops, branch_root, timestamp, timezone, committer, revprops, revision_id, revno, merges, fileprops)
         revprops[mapping.SVN_REVPROP_BZR_MAPPING_VERSION] = "3"
         return (revprops, fileprops)
 

=== modified file 'tests/test_branch.py'
--- a/tests/test_branch.py	2008-08-23 15:38:17 +0000
+++ b/tests/test_branch.py	2008-08-24 15:29:46 +0000
@@ -73,7 +73,7 @@
         dc.close()
 
         b = Branch.open(repos_url + "/trunk")
-        b.tags.set_tag("mytag", b.repository.generate_revision_id(1, "trunk", b.repository.get_mapping()))
+        b.tags.set_tag(u"mytag", b.repository.generate_revision_id(1, "trunk", b.repository.get_mapping()))
 
         self.assertEquals(core.NODE_DIR, 
                 b.repository.transport.check_path("tags/mytag", 3))
@@ -89,7 +89,7 @@
 
         b = Branch.open(repos_url + "/trunk")
         self.assertEquals(["foo"], b.tags.get_tag_dict().keys())
-        b.tags.delete_tag("foo")
+        b.tags.delete_tag(u"foo")
         b = Branch.open(repos_url + "/trunk")
         self.assertEquals([], b.tags.get_tag_dict().keys())
 
@@ -124,7 +124,7 @@
         dc.close()
        
         b = Branch.open(repos_url + "/trunk")
-        self.assertRaises(NoSuchTag, b.tags.delete_tag, "foo")
+        self.assertRaises(NoSuchTag, b.tags.delete_tag, u"foo")
 
     def test_get_branch_path_old(self):
         repos_url = self.make_repository("a")

=== modified file 'tests/test_scheme.py'
--- a/tests/test_scheme.py	2008-08-23 10:54:14 +0000
+++ b/tests/test_scheme.py	2008-08-24 15:29:46 +0000
@@ -453,11 +453,11 @@
 
     def test_get_tag_path_zero(self):
         self.assertEquals("tags/foo", 
-                          TrunkBranchingScheme().get_tag_path("foo"))
+                          TrunkBranchingScheme().get_tag_path(u"foo"))
 
     def test_get_tag_path_nonzero(self):
         self.assertEquals("my/project/tags/foo",
-                          TrunkBranchingScheme(2).get_tag_path("foo", "my/project"))
+                          TrunkBranchingScheme(2).get_tag_path(u"foo", "my/project"))
 
     def test_get_branch_path_zero(self):
         self.assertEquals("branches/foo",