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

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1604
revision-id: jelmer at samba.org-20080822163929-9p3ljwe6g6f5gitn
parent: jelmer at samba.org-20080822162240-5k1x6t714qwgify4
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-08-22 18:39:29 +0200
message:
  Fix tests.
modified:
  revids.py                      revids.py-20070416220458-36vfa0730cchevp1-1
  tests/test_scheme.py           test_scheme.py-20060621221855-va2xabhlxpmc9llx-1
=== modified file 'revids.py'
--- a/revids.py	2008-08-22 15:47:02 +0000
+++ b/revids.py	2008-08-22 16:39:29 +0000
@@ -69,7 +69,7 @@
         raise NoSuchRevision(self, revid)
 
     def discover_revids(self, layout, from_revnum, to_revnum, project=None):
-        reuse_policy = self.get_config().get_reuse_revisions()
+        reuse_policy = self.repos.get_config().get_reuse_revisions()
         assert reuse_policy in ("other-branches", "removed-branches", "none") 
         check_removed = (reuse_policy == "removed-branches")
         for (branch, revno, exists) in self.repos.find_fileprop_branches(layout, from_revnum, to_revnum, project, check_removed=check_removed):

=== modified file 'tests/test_scheme.py'
--- a/tests/test_scheme.py	2008-08-22 05:02:07 +0000
+++ b/tests/test_scheme.py	2008-08-22 16:39:29 +0000
@@ -221,12 +221,12 @@
 
     def test_unprefix_wildcard(self):
         scheme = ListBranchingScheme(["*/trunk"])
-        self.assertEquals(("", "bla/trunk", "foo"), 
+        self.assertEquals(("bla/trunk", "bla/trunk", "foo"), 
                           scheme.unprefix("bla/trunk/foo"))
 
     def test_unprefix_wildcard_multiple(self):
         scheme = ListBranchingScheme(["trunk/*/*"])
-        self.assertEquals(("", "trunk/foo/bar", "bla/blie"), 
+        self.assertEquals(("trunk/foo/bar", "trunk/foo/bar", "bla/blie"), 
                           scheme.unprefix("trunk/foo/bar/bla/blie"))
 
     def test_unprefix_wildcard_nonexistant(self):
@@ -242,25 +242,26 @@
         self.assertRaises(NotBranchError, self.scheme.unprefix, "blie/bloe/bla")
 
     def test_unprefix_branch_slash(self):
-        self.assertEqual(self.scheme.unprefix("/foo"), ("", "foo", ""))
+        self.assertEqual(self.scheme.unprefix("/foo"), ("foo", "foo", ""))
 
     def test_unprefix_branch(self):
-        self.assertEqual(self.scheme.unprefix("foo"), ("", "foo", ""))
+        self.assertEqual(self.scheme.unprefix("foo"), ("foo", "foo", ""))
 
     def test_unprefix_nested_slash(self):
-        self.assertEqual(self.scheme.unprefix("/foo/foo"), ("", "foo", "foo"))
+        self.assertEqual(self.scheme.unprefix("/foo/foo"), ("foo", "foo", "foo"))
 
     def test_unprefix_nested(self):
-        self.assertEqual(self.scheme.unprefix("foo/bar"), ("", "foo", "bar"))
+        self.assertEqual(self.scheme.unprefix("foo/bar"), ("foo", "foo", "bar"))
 
     def test_unprefix_double_nested(self):
-        self.assertEqual(self.scheme.unprefix("foo/bar/bla"), ("", "foo", "bar/bla"))
+        self.assertEqual(self.scheme.unprefix("foo/bar/bla"), ("foo", "foo", "bar/bla"))
 
     def test_unprefix_double_slash(self):
-        self.assertEqual(self.scheme.unprefix("//foo/"), ("", "foo", ""))
+        self.assertEqual(self.scheme.unprefix("//foo/"), ("foo", "foo", ""))
 
     def test_unprefix_nested_branch(self):
-        self.assertEqual(self.scheme.unprefix("bar/bloe"), ("", "bar/bloe", ""))
+        self.assertEqual(self.scheme.unprefix("bar/bloe"), 
+                         ("bar/bloe", "bar/bloe", ""))
 
     def test_str(self):
         self.assertEqual("list-QlpoOTFBWSZTWSDz6woAAAPRgAAQAACzBJAAIAAiDRo9QgyYjmbjatAeLuSKcKEgQefWFA..", str(self.scheme))