Rev 2224: Add tests for get_use_cache(). in file:///data/jelmer/bzr-svn/mappings/
Jelmer Vernooij
jelmer at samba.org
Sun Dec 7 21:50:51 GMT 2008
At file:///data/jelmer/bzr-svn/mappings/
------------------------------------------------------------
revno: 2224
revision-id: jelmer at samba.org-20081207215049-hwamku3rxsrnqu5c
parent: jelmer at samba.org-20081207214405-or0gnp5sw5vky6vt
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: mappings
timestamp: Sun 2008-12-07 22:50:49 +0100
message:
Add tests for get_use_cache().
modified:
config.py config.py-20070624185721-0j8f1ly75uo4s1lk-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
tests/test_config.py test_config.py-20070624193244-itvnst60evjidr4z-1
tests/test_repository.py test_repos.py-20060508151940-ddc49a59257ca712
=== modified file 'config.py'
--- a/config.py 2008-12-07 21:44:05 +0000
+++ b/config.py 2008-12-07 21:50:49 +0000
@@ -156,8 +156,9 @@
ret = set([val])
else:
ret = set(val)
- if len(ret - set(["log", "fileids", "revids"])) == 0:
+ if len(ret - set(["log", "fileids", "revids"])) != 0:
raise BzrError("Invalid setting 'use-cache': %r" % val)
+ return ret
except KeyError:
return None
=== modified file 'repository.py'
--- a/repository.py 2008-12-07 21:44:05 +0000
+++ b/repository.py 2008-12-07 21:50:49 +0000
@@ -149,10 +149,7 @@
use_cache = self.get_config().get_use_cache()
if use_cache is None:
- use_cache = set(["fileids", "revids"])
- if (self.transport.has_capability("commit-revprops") and not
- self.transport.has_capability("log-revprops")):
- use_cache.add("log")
+ use_cache = set(["fileids", "revids", "log"])
if use_cache:
cache_dir = self.create_cache_dir()
=== modified file 'tests/test_config.py'
--- a/tests/test_config.py 2008-12-03 15:24:59 +0000
+++ b/tests/test_config.py 2008-12-07 21:50:49 +0000
@@ -114,6 +114,16 @@
c.set_user_option("default-mapping", "v8")
self.assertEquals("v8", c.get_default_mapping())
+ def test_use_cache(self):
+ c = SvnRepositoryConfig("blabla-cache")
+ self.assertEquals(None, c.get_use_cache())
+ c.set_user_option("use-cache", "True")
+ self.assertEquals(set(["log", "revids", "fileids"]), c.get_use_cache())
+ c.set_user_option("use-cache", ["log", "revids"])
+ self.assertEquals(set(["log", "revids"]), c.get_use_cache())
+ c.set_user_option("use-cache", "False")
+ self.assertEquals(set([]), c.get_use_cache())
+
class BranchConfigTests(SubversionTestCase):
def setUp(self):
=== modified file 'tests/test_repository.py'
--- a/tests/test_repository.py 2008-12-07 21:44:05 +0000
+++ b/tests/test_repository.py 2008-12-07 21:50:49 +0000
@@ -112,59 +112,51 @@
self.assertFalse(repos.seen_bzr_revprops())
def test_find_children_empty(self):
- repos_url = self.make_repository("a")
-
- cb = self.get_commit_editor(repos_url)
+ cb = self.get_commit_editor(self.repos_url)
cb.add_dir("trunk")
cb.close()
- walker = Repository.open(repos_url)
+ walker = Repository.open(self.repos_url)
self.assertEqual([], list(walker.find_children("trunk", 1)))
def test_find_children_one(self):
- repos_url = self.make_repository("a")
-
- cb = self.get_commit_editor(repos_url)
+ cb = self.get_commit_editor(self.repos_url)
t = cb.add_dir("trunk")
t.add_file("trunk/data")
cb.close()
- walker = Repository.open(repos_url)
+ walker = Repository.open(self.repos_url)
self.assertEqual(['trunk/data'], list(walker.find_children("trunk", 1)))
def test_find_children_nested(self):
- repos_url = self.make_repository("a")
-
- cb = self.get_commit_editor(repos_url)
+ cb = self.get_commit_editor(self.repos_url)
t = cb.add_dir("trunk")
td = t.add_dir("trunk/data")
td.add_file("trunk/data/bla")
t.add_file("trunk/file")
cb.close()
- walker = Repository.open(repos_url)
+ walker = Repository.open(self.repos_url)
self.assertEqual(
set(['trunk/data', 'trunk/data/bla', 'trunk/file']),
set(walker.find_children("trunk", 1)))
def test_find_children_later(self):
- repos_url = self.make_repository("a")
-
- cb = self.get_commit_editor(repos_url)
+ cb = self.get_commit_editor(self.repos_url)
t = cb.add_dir("trunk")
td = t.add_dir("trunk/data")
td.add_file("trunk/data/bla")
cb.close()
- cb = self.get_commit_editor(repos_url)
+ cb = self.get_commit_editor(self.repos_url)
t = cb.open_dir("trunk")
t.add_file("trunk/file")
cb.close()
- walker = Repository.open(repos_url)
+ walker = Repository.open(self.repos_url)
self.assertEqual(set(['trunk/data', 'trunk/data/bla']),
set(walker.find_children("trunk", 1)))
@@ -173,9 +165,7 @@
def test_find_children_copy(self):
- repos_url = self.make_repository("a")
-
- cb = self.get_commit_editor(repos_url)
+ cb = self.get_commit_editor(self.repos_url)
t = cb.add_dir("trunk")
td = t.add_dir("trunk/data")
td.add_file("trunk/data/bla").modify()
@@ -184,13 +174,13 @@
db.add_file("trunk/db/f2").modify()
cb.close()
- cb = self.get_commit_editor(repos_url)
+ cb = self.get_commit_editor(self.repos_url)
t = cb.open_dir("trunk")
td = t.open_dir("trunk/data")
td.add_dir("trunk/data/fg", "trunk/db")
cb.close()
- walker = Repository.open(repos_url)
+ walker = Repository.open(self.repos_url)
self.assertEqual(set(['trunk/data', 'trunk/data/bla',
'trunk/data/fg', 'trunk/data/fg/f1',
@@ -199,9 +189,7 @@
set(walker.find_children("trunk", 2)))
def test_find_children_copy_del(self):
- repos_url = self.make_repository("a")
-
- cb = self.get_commit_editor(repos_url)
+ cb = self.get_commit_editor(self.repos_url)
t = cb.add_dir("trunk")
td = t.add_dir("trunk/data")
td.add_file("trunk/data/bla")
@@ -210,20 +198,20 @@
db.add_file("trunk/db/f2")
cb.close()
- cb = self.get_commit_editor(repos_url)
+ cb = self.get_commit_editor(self.repos_url)
t = cb.open_dir("trunk")
td = t.open_dir("trunk/data")
td.add_dir("trunk/data/fg", "trunk/db")
cb.close()
- cb = self.get_commit_editor(repos_url)
+ cb = self.get_commit_editor(self.repos_url)
t = cb.open_dir("trunk")
td = t.open_dir("trunk/data")
fg = td.open_dir("trunk/data/fg")
fg.delete("trunk/data/fg/f2")
cb.close()
- walker = Repository.open(repos_url)
+ walker = Repository.open(self.repos_url)
self.assertEqual(set(['trunk/data', 'trunk/data/bla',
'trunk/data/fg', 'trunk/data/fg/f1', 'trunk/db',
More information about the bazaar-commits
mailing list