Rev 2204: Fix some tests. in file:///data/jelmer/bzr-svn/mappings/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 2204
revision-id: jelmer at samba.org-20081206230308-89imb04w3gqttyp3
parent: jelmer at samba.org-20081206221614-fvcjh7g7n0fqa0wy
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: mappings
timestamp: Sun 2008-12-07 00:03:08 +0100
message:
  Fix some tests.
modified:
  mapping4.py                    mapping4.py-20080827182338-y4xzpsf43vyiwcir-1
  revmeta.py                     revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
  tests/mapping_implementations/test_base.py test_base.py-20080904055908-3t0g1y0qnmr6aeiq-1
=== modified file 'mapping4.py'
--- a/mapping4.py	2008-12-06 22:16:14 +0000
+++ b/mapping4.py	2008-12-06 23:03:08 +0000
@@ -162,13 +162,13 @@
             assert features.issubset(supported_features), "missing feature: %r" % features.difference(supported_features)
         if svn_revprops.has_key(mapping.SVN_REVPROP_BZR_MAPPING_VERSION):
             assert svn_revprops[mapping.SVN_REVPROP_BZR_MAPPING_VERSION] == self.name, "unknown mapping: %s" % svn_revprops[mapping.SVN_REVPROP_BZR_MAPPING_VERSION]
-            self.revprops.import_revision(svn_revprops, fileprops, foreign_revid, rev)
+            self.revprops.import_revision_revprops(svn_revprops, foreign_revid, rev)
 
     def import_revision_fileprops(self, fileprops, foreign_revid, rev):
         if fileprops.has_key(mapping.SVN_PROP_BZR_REQUIRED_FEATURES):
             features = mapping.parse_required_features_property(fileprops[mapping.SVN_PROP_BZR_REQUIRED_FEATURES])
             assert features.issubset(supported_features), "missing feature: %r" % features.difference(supported_features)
-        self.fileprops.import_revision(svn_revprops, fileprops, foreign_revid, rev)
+        self.fileprops.import_revision_fileprops(fileprops, foreign_revid, rev)
 
     def get_mandated_layout(self, repository):
         return None

=== modified file 'revmeta.py'
--- a/revmeta.py	2008-12-06 22:16:14 +0000
+++ b/revmeta.py	2008-12-06 23:03:08 +0000
@@ -548,14 +548,14 @@
                               revision_id=self.get_revision_id(mapping), 
                               parent_ids=parent_ids)
 
-        rev.svn_meta = self
-
         mapping.import_revision_revprops(self.get_revprops(), 
                                 self.get_foreign_revid(), rev)
 
         mapping.import_revision_fileprops(self.get_changed_fileprops(), 
                                 self.get_foreign_revid(), rev)
 
+        rev.svn_meta = self
+
         return rev
 
     def _import_from_props(self, mapping, fileprop_fn, revprop_fn, default):

=== modified file 'tests/mapping_implementations/test_base.py'
--- a/tests/mapping_implementations/test_base.py	2008-12-06 22:16:14 +0000
+++ b/tests/mapping_implementations/test_base.py	2008-12-06 23:03:08 +0000
@@ -114,7 +114,7 @@
             self.assertEquals(targetrev.timezone, 0)
 
         if self.mapping.can_use_fileprops:
-        self.mapping.import_revision_fileprops(changed_props(fileprops), ("someuuid", "somebp", 4), targetrev)
+            self.mapping.import_revision_fileprops(changed_props(fileprops), ("someuuid", "somebp", 4), targetrev)
             self.assertEquals(targetrev.committer, "somebody")
             self.assertEquals(targetrev.properties, {"arevprop": "val"})
             self.assertEquals(targetrev.timestamp, 432432432.0)