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

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1897
revision-id: jelmer at samba.org-20080909191654-aycxaqj50by2w8bo
parent: jelmer at samba.org-20080909191459-bsaazrna2s4owa4g
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Tue 2008-09-09 21:16:54 +0200
message:
  Fix more tests.
modified:
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
  layout/__init__.py             layout.py-20080323165407-y9qw8nx4oykvoe1k-1
  tests/test_layout.py           test_layout.py-20080831140344-mixj35u5n1qnephn-1
  tests/test_push.py             test_push.py-20070201165715-g2ievcdfqi33wqsy-1
  tests/test_tree.py             test_tree.py-20070103204350-pr8nupes7e5sd2wr-1
  tests/test_upgrade.py          test_upgrade.py-20070106170128-64zt3eqggg4tng1c-1
=== modified file '__init__.py'
--- a/__init__.py	2008-09-09 19:14:59 +0000
+++ b/__init__.py	2008-09-09 19:16:54 +0000
@@ -182,7 +182,7 @@
     from bzrlib.errors import BzrCommandError
     
     try:
-        ret = layout_registry.get(layoutname)
+        ret = layout_registry.get(layoutname)()
     except KeyError:
         raise BzrCommandError('No such repository layout %r' % layoutname)
     return ret

=== modified file 'layout/__init__.py'
--- a/layout/__init__.py	2008-09-09 18:53:33 +0000
+++ b/layout/__init__.py	2008-09-09 19:16:54 +0000
@@ -16,6 +16,7 @@
 from bzrlib import registry, urlutils, ui
 from bzrlib.errors import NotBranchError
 from bzrlib.trace import mutter
+
 from bzrlib.plugins.svn.core import SubversionException, NODE_DIR
 from bzrlib.plugins.svn.errors import ERR_FS_NOT_DIRECTORY, ERR_FS_NOT_FOUND, ERR_RA_DAV_PATH_NOT_FOUND, InvalidSvnBranchPath
 from bzrlib.plugins.svn.ra import DIRENT_KIND

=== modified file 'tests/test_layout.py'
--- a/tests/test_layout.py	2008-09-03 01:04:06 +0000
+++ b/tests/test_layout.py	2008-09-09 19:16:54 +0000
@@ -15,7 +15,7 @@
 
 from bzrlib.errors import NotBranchError
 from bzrlib.tests import TestCase
-from bzrlib.plugins.svn import layout
+from bzrlib.plugins.svn.layout.standard import RootLayout, TrunkLayout
 
 
 class LayoutTests:
@@ -36,13 +36,13 @@
 class RootLayoutTests(TestCase,LayoutTests):
 
     def setUp(self):
-        self.layout = layout.RootLayout()
+        self.layout = RootLayout()
 
 
 class TrunkLayoutTests(TestCase,LayoutTests):
 
     def setUp(self):
-        self.layout = layout.TrunkLayout()
+        self.layout = TrunkLayout()
 
     def test_parse_trunk(self):
         self.assertEquals(("branch", "", "trunk", ""), 

=== modified file 'tests/test_push.py'
--- a/tests/test_push.py	2008-09-09 18:53:33 +0000
+++ b/tests/test_push.py	2008-09-09 19:16:54 +0000
@@ -439,8 +439,9 @@
         push(b.repository.get_graph(), b, wt.branch.repository, 
              wt.branch.revision_history()[-2])
         mutter('log %r' % self.client_log("%s/trunk" % self.repos_url, 0, 4)[4][0])
-        self.assertEquals('M',
-            self.client_log("%s/trunk" % self.repos_url, 0, 4)[4][0]['/trunk'][0])
+        if not b.mapping.can_use_revprops and b.mapping.can_use_fileprops:
+            self.assertEquals('M',
+                self.client_log("%s/trunk" % self.repos_url, 0, 4)[4][0]['/trunk'][0])
         b = Branch.open("%s/trunk" % self.repos_url)
         push(b.repository.get_graph(), b, wt.branch.repository, wt.branch.last_revision())
         mutter('log %r' % self.client_log("%s/trunk" % self.repos_url, 0, 5)[5][0])

=== modified file 'tests/test_tree.py'
--- a/tests/test_tree.py	2008-09-09 18:53:33 +0000
+++ b/tests/test_tree.py	2008-09-09 19:16:54 +0000
@@ -26,6 +26,7 @@
 
 from bzrlib.plugins.svn import errors
 from bzrlib.plugins.svn.core import SubversionException
+from bzrlib.plugins.svn.layout.standard import RootLayout
 from bzrlib.plugins.svn.tests import SubversionTestCase
 from bzrlib.plugins.svn.tree import SvnBasisTree, inventory_add_external
 

=== modified file 'tests/test_upgrade.py'
--- a/tests/test_upgrade.py	2008-09-09 18:53:33 +0000
+++ b/tests/test_upgrade.py	2008-09-09 19:16:54 +0000
@@ -221,7 +221,7 @@
         renames = upgrade_repository(newrepos, oldrepos, new_mapping=mapping, mapping_registry=mapping_registry, 
                                      allow_changes=True)
         self.assertEqual({
-            'svn-v1:1@%s-' % oldrepos.uuid: 'svn-v3-none:%s::1' % oldrepos.uuid,
+            'svn-v1:1@%s-' % oldrepos.uuid: mapping.revision_id_foreign_to_bzr((oldrepos.uuid, "", 1)),
             "customrev": "customrev%s-upgrade" % mapping.upgrade_suffix,
             "anotherrev": "anotherrev%s-upgrade" % mapping.upgrade_suffix},
             renames)