Rev 1679: Fix tests. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/trunk/

------------------------------------------------------------
revno: 1679
revision-id: jelmer at samba.org-20080828005550-k76enl243472kdk0
parent: jelmer at samba.org-20080827195647-l4p0eus0ua24m8or
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2008-08-28 02:55:50 +0200
message:
  Fix tests.
modified:
  mapping4.py                    mapping4.py-20080827182338-y4xzpsf43vyiwcir-1
  tests/test_branch.py           test_branch.py-20060508162215-74ffeb5d608f8e20
  workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'mapping4.py'
--- a/mapping4.py	2008-08-27 19:29:40 +0000
+++ b/mapping4.py	2008-08-28 00:55:50 +0000
@@ -36,14 +36,13 @@
 
     def import_revision(self, svn_revprops, fileprops, uuid, branch, revnum, rev):
         super(BzrSvnMappingv4, self).import_revision(svn_revprops, fileprops, uuid, branch, revnum, rev)
-        if revprops.has_key(mapping.SVN_REVPROP_BZR_REQUIRED_FEATURES):
-            features = set(revprops[mapping.SVN_REVPROP_BZR_REQUIRED_FEATURES].split(","))
-            assert features.issubset(supported_features)
+        if svn_revprops.has_key(mapping.SVN_REVPROP_BZR_REQUIRED_FEATURES):
+            features = set(svn_revprops[mapping.SVN_REVPROP_BZR_REQUIRED_FEATURES].split(","))
+            assert features.issubset(supported_features), "missing feature: %r" % features.difference(supported_features)
 
     def 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] = "4"
-        revprops[mapping.SVN_REVPROP_BZR_REQUIRED_FEATURES] = ",".join([])
         return (revprops, fileprops)
 
     @classmethod

=== modified file 'tests/test_branch.py'
--- a/tests/test_branch.py	2008-08-25 02:03:39 +0000
+++ b/tests/test_branch.py	2008-08-28 00:55:50 +0000
@@ -289,7 +289,7 @@
 
         dc = self.get_commit_editor(repos_url)
         dc.add_file("foo").modify()
-        dc.change_prop(SVN_PROP_BZR_REVISION_ID+"none", 
+        dc.change_prop(SVN_PROP_BZR_REVISION_ID+"v3-none", 
                 "42 mycommit\n")
         dc.close()
         

=== modified file 'workingtree.py'
--- a/workingtree.py	2008-08-27 19:11:09 +0000
+++ b/workingtree.py	2008-08-28 00:55:50 +0000
@@ -458,7 +458,7 @@
             extra = "%d %s\n" % (self.branch.revno()+1, rev_id)
         else:
             extra = ""
-        original_props = self._get_branch_props()
+        original_props = self._get_base_branch_props()
         wc = self._get_wc(write_lock=True)
         (svn_revprops, svn_fileprops) = self.branch.mapping.export_revision(False, self.branch.get_branch_path(), 
                                             timestamp, timezone, committer, revprops,