Rev 5829: (jelmer) Move more VersionedFiles-specific tests to bt.per_repository_vf. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu May 5 00:41:53 UTC 2011
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 5829 [merge]
revision-id: pqm at pqm.ubuntu.com-20110505004149-54ffs4bzdy90dkh9
parent: pqm at pqm.ubuntu.com-20110504235319-9yz7jg7i0mica9wk
parent: jelmer at samba.org-20110504211036-d4urb6cv1iud4l0e
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2011-05-05 00:41:49 +0000
message:
(jelmer) Move more VersionedFiles-specific tests to bt.per_repository_vf.
(Jelmer Vernooij)
modified:
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/per_repository_vf/test_repository.py test_repository.py-20110224144010-ukgfmlxcgsibq4u4-3
bzrlib/tests/per_workingtree/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/per_workingtree/test_break_lock.py test_break_lock.py-20060504115740-233e245df546fd42
bzrlib/tests/per_workingtree/test_is_control_filename.py test_is_control_filename.py-20060216024958-f5afdebb2fa36418
bzrlib/tests/per_workingtree/test_is_ignored.py test_is_ignored.py-20060518083307-a5b383dd4d070083
bzrlib/tests/per_workingtree/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-3
bzrlib/tests/per_workingtree/test_move.py test_move.py-20070225171927-mohn2vqj5fx7edc6-1
bzrlib/tests/per_workingtree/test_readonly.py test_readonly.py-20061219164256-7imbl63m4j15n0es-1
bzrlib/tests/per_workingtree/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/tests/per_workingtree/test_revision_tree.py test_revision_tree.p-20060908041847-n15ngjoxpivwls0v-2
bzrlib/tests/per_workingtree/test_smart_add.py test_smart_add.py-20070215175752-9s5mxoz8aqpd80fm-1
bzrlib/tests/per_workingtree/test_symlinks.py test_symlinks.py-20100715135626-4lw38d8njbzyec6l-1
bzrlib/tests/per_workingtree/test_uncommit.py test_uncommit.py-20070712063057-8zaprw7t7lcqxeje-1
bzrlib/tests/per_workingtree/test_unversion.py test_unversion.py-20060907074408-bygh2y28jz8u0cg7-1
=== modified file 'bzrlib/tests/per_repository/test_commit_builder.py'
--- a/bzrlib/tests/per_repository/test_commit_builder.py 2011-04-17 23:06:22 +0000
+++ b/bzrlib/tests/per_repository/test_commit_builder.py 2011-05-04 13:00:00 +0000
@@ -535,7 +535,8 @@
basis_tree = tree.basis_tree()
basis_tree.lock_read()
self.addCleanup(basis_tree.unlock)
- self.assertEqual(rev_id, basis_tree.inventory.root.revision)
+ self.assertEqual(rev_id,
+ basis_tree.get_file_revision(basis_tree.get_root_id()))
def _get_revtrees(self, tree, revision_ids):
tree.lock_read()
@@ -555,11 +556,13 @@
rev1 = tree.commit('')
rev2 = tree.commit('')
tree1, tree2 = self._get_revtrees(tree, [rev1, rev2])
- self.assertEqual(rev1, tree1.inventory.root.revision)
+ self.assertEqual(rev1, tree1.get_file_revision(tree1.get_root_id()))
if tree.branch.repository.supports_rich_root():
- self.assertEqual(rev1, tree2.inventory.root.revision)
+ self.assertEqual(rev1,
+ tree2.get_file_revision(tree2.get_root_id()))
else:
- self.assertEqual(rev2, tree2.inventory.root.revision)
+ self.assertEqual(rev2,
+ tree2.get_file_revision(tree2.get_root_id()))
def _add_commit_check_unchanged(self, tree, name, mini_commit=None):
tree.add([name], [name + 'id'])
=== modified file 'bzrlib/tests/per_repository/test_repository.py'
--- a/bzrlib/tests/per_repository/test_repository.py 2011-05-04 19:06:44 +0000
+++ b/bzrlib/tests/per_repository/test_repository.py 2011-05-04 21:10:36 +0000
@@ -320,7 +320,8 @@
tree = wt.branch.repository.revision_tree('revision-1')
tree.lock_read()
try:
- self.assertEqual('revision-1', tree.inventory.root.revision)
+ self.assertEqual('revision-1',
+ tree.get_file_revision(tree.get_root_id()))
expected = inventory.InventoryDirectory('fixed-root', '', None)
expected.revision = 'revision-1'
self.assertEqual([('', 'V', 'directory', 'fixed-root', expected)],
@@ -562,11 +563,6 @@
repo._format.rich_root_data
repo._format.supports_tree_reference
- def test_get_serializer_format(self):
- repo = self.make_repository('.')
- format = repo.get_serializer_format()
- self.assertEqual(repo._serializer.format_num, format)
-
def test_iter_files_bytes(self):
tree = self.make_branch_and_tree('tree')
self.build_tree_contents([('tree/file1', 'foo'),
@@ -731,34 +727,6 @@
b.repository.add_signature_text, 'A',
'This might be a signature')
- def test_add_revision_inventory_sha1(self):
- inv = inventory.Inventory(revision_id='A')
- inv.root.revision = 'A'
- inv.root.file_id = 'fixed-root'
- # Insert the inventory on its own to an identical repository, to get
- # its sha1.
- reference_repo = self.make_repository('reference_repo')
- reference_repo.lock_write()
- reference_repo.start_write_group()
- inv_sha1 = reference_repo.add_inventory('A', inv, [])
- reference_repo.abort_write_group()
- reference_repo.unlock()
- # Now insert a revision with this inventory, and it should get the same
- # sha1.
- repo = self.make_repository('repo')
- repo.lock_write()
- repo.start_write_group()
- root_id = inv.root.file_id
- repo.texts.add_lines(('fixed-root', 'A'), [], [])
- repo.add_revision('A', _mod_revision.Revision(
- 'A', committer='B', timestamp=0,
- timezone=0, message='C'), inv=inv)
- repo.commit_write_group()
- repo.unlock()
- repo.lock_read()
- self.assertEquals(inv_sha1, repo.get_revision('A').inventory_sha1)
- repo.unlock()
-
# XXX: this helper duplicated from tests.test_repository
def make_remote_repository(self, path, shared=False):
"""Make a RemoteRepository object backed by a real repository that will
=== modified file 'bzrlib/tests/per_repository_vf/test_repository.py'
--- a/bzrlib/tests/per_repository_vf/test_repository.py 2011-05-02 22:39:15 +0000
+++ b/bzrlib/tests/per_repository_vf/test_repository.py 2011-05-04 21:10:36 +0000
@@ -19,7 +19,9 @@
from bzrlib import (
errors,
gpg,
+ inventory,
repository as _mod_repository,
+ revision as _mod_revision,
tests,
versionedfile,
)
@@ -114,6 +116,39 @@
self.assertRaises(errors.ObjectNotLocked,
inventories.add_lines, ('foo',), [], [])
+ def test_get_serializer_format(self):
+ repo = self.make_repository('.')
+ format = repo.get_serializer_format()
+ self.assertEqual(repo._serializer.format_num, format)
+
+ def test_add_revision_inventory_sha1(self):
+ inv = inventory.Inventory(revision_id='A')
+ inv.root.revision = 'A'
+ inv.root.file_id = 'fixed-root'
+ # Insert the inventory on its own to an identical repository, to get
+ # its sha1.
+ reference_repo = self.make_repository('reference_repo')
+ reference_repo.lock_write()
+ reference_repo.start_write_group()
+ inv_sha1 = reference_repo.add_inventory('A', inv, [])
+ reference_repo.abort_write_group()
+ reference_repo.unlock()
+ # Now insert a revision with this inventory, and it should get the same
+ # sha1.
+ repo = self.make_repository('repo')
+ repo.lock_write()
+ repo.start_write_group()
+ root_id = inv.root.file_id
+ repo.texts.add_lines(('fixed-root', 'A'), [], [])
+ repo.add_revision('A', _mod_revision.Revision(
+ 'A', committer='B', timestamp=0,
+ timezone=0, message='C'), inv=inv)
+ repo.commit_write_group()
+ repo.unlock()
+ repo.lock_read()
+ self.assertEquals(inv_sha1, repo.get_revision('A').inventory_sha1)
+ repo.unlock()
+
def test_install_revisions(self):
wt = self.make_branch_and_tree('source')
wt.commit('A', allow_pointless=True, rev_id='A')
=== modified file 'bzrlib/tests/per_workingtree/__init__.py'
--- a/bzrlib/tests/per_workingtree/__init__.py 2011-02-24 16:45:27 +0000
+++ b/bzrlib/tests/per_workingtree/__init__.py 2011-05-04 11:15:37 +0000
@@ -24,7 +24,6 @@
from bzrlib import (
branchbuilder,
- errors,
tests,
workingtree,
)
=== modified file 'bzrlib/tests/per_workingtree/test_break_lock.py'
--- a/bzrlib/tests/per_workingtree/test_break_lock.py 2010-01-25 17:48:22 +0000
+++ b/bzrlib/tests/per_workingtree/test_break_lock.py 2011-05-04 11:15:37 +0000
@@ -15,9 +15,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-from cStringIO import StringIO
-import os
-
from bzrlib import (
errors,
ui,
=== modified file 'bzrlib/tests/per_workingtree/test_is_control_filename.py'
--- a/bzrlib/tests/per_workingtree/test_is_control_filename.py 2009-07-10 07:14:02 +0000
+++ b/bzrlib/tests/per_workingtree/test_is_control_filename.py 2011-05-04 11:15:37 +0000
@@ -15,8 +15,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-import os
-
from bzrlib.osutils import basename
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
=== modified file 'bzrlib/tests/per_workingtree/test_is_ignored.py'
--- a/bzrlib/tests/per_workingtree/test_is_ignored.py 2010-07-08 13:00:19 +0000
+++ b/bzrlib/tests/per_workingtree/test_is_ignored.py 2011-05-04 11:15:37 +0000
@@ -15,8 +15,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-import bzrlib
-from bzrlib import config, ignores, osutils
+from bzrlib import config, ignores
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
=== modified file 'bzrlib/tests/per_workingtree/test_locking.py'
--- a/bzrlib/tests/per_workingtree/test_locking.py 2010-05-11 14:14:55 +0000
+++ b/bzrlib/tests/per_workingtree/test_locking.py 2011-05-04 11:15:37 +0000
@@ -21,7 +21,6 @@
from bzrlib import (
branch,
errors,
- lockdir,
)
from bzrlib.tests import TestSkipped
from bzrlib.tests.matchers import *
=== modified file 'bzrlib/tests/per_workingtree/test_move.py'
--- a/bzrlib/tests/per_workingtree/test_move.py 2011-04-15 07:01:22 +0000
+++ b/bzrlib/tests/per_workingtree/test_move.py 2011-05-04 11:15:37 +0000
@@ -24,7 +24,6 @@
tests,
)
-from bzrlib.workingtree_4 import DirStateWorkingTreeFormat
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
=== modified file 'bzrlib/tests/per_workingtree/test_readonly.py'
--- a/bzrlib/tests/per_workingtree/test_readonly.py 2010-01-25 15:55:48 +0000
+++ b/bzrlib/tests/per_workingtree/test_readonly.py 2011-05-04 11:15:37 +0000
@@ -21,7 +21,6 @@
import time
from bzrlib import (
- errors,
hashcache,
tests,
)
=== modified file 'bzrlib/tests/per_workingtree/test_remove.py'
--- a/bzrlib/tests/per_workingtree/test_remove.py 2011-04-15 07:01:22 +0000
+++ b/bzrlib/tests/per_workingtree/test_remove.py 2011-05-04 11:15:37 +0000
@@ -17,7 +17,7 @@
"""Tests for interface conformance of 'WorkingTree.remove'"""
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
-from bzrlib import errors, ignores, osutils
+from bzrlib import ignores, osutils
class TestRemove(TestCaseWithWorkingTree):
"""Tests WorkingTree.remove"""
=== modified file 'bzrlib/tests/per_workingtree/test_revision_tree.py'
--- a/bzrlib/tests/per_workingtree/test_revision_tree.py 2010-03-10 09:33:04 +0000
+++ b/bzrlib/tests/per_workingtree/test_revision_tree.py 2011-05-04 11:15:37 +0000
@@ -24,7 +24,6 @@
"""
from bzrlib import (
- branchbuilder,
errors,
tests,
)
=== modified file 'bzrlib/tests/per_workingtree/test_smart_add.py'
--- a/bzrlib/tests/per_workingtree/test_smart_add.py 2011-04-21 20:32:16 +0000
+++ b/bzrlib/tests/per_workingtree/test_smart_add.py 2011-05-04 21:10:36 +0000
@@ -21,12 +21,10 @@
import sys
from bzrlib import (
- add,
errors,
ignores,
osutils,
tests,
- workingtree,
)
from bzrlib.tests import (
test_smart_add,
=== modified file 'bzrlib/tests/per_workingtree/test_symlinks.py'
--- a/bzrlib/tests/per_workingtree/test_symlinks.py 2010-08-17 06:45:33 +0000
+++ b/bzrlib/tests/per_workingtree/test_symlinks.py 2011-05-04 11:15:37 +0000
@@ -20,7 +20,6 @@
import os
from bzrlib import (
- builtins,
osutils,
tests,
workingtree,
=== modified file 'bzrlib/tests/per_workingtree/test_uncommit.py'
--- a/bzrlib/tests/per_workingtree/test_uncommit.py 2009-07-10 07:14:02 +0000
+++ b/bzrlib/tests/per_workingtree/test_uncommit.py 2011-05-04 11:15:37 +0000
@@ -16,12 +16,7 @@
"""Tests of the parent related functions of WorkingTrees."""
-import os
-
from bzrlib import (
- errors,
- revision as _mod_revision,
- symbol_versioning,
uncommit,
)
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
=== modified file 'bzrlib/tests/per_workingtree/test_unversion.py'
--- a/bzrlib/tests/per_workingtree/test_unversion.py 2010-11-05 20:54:32 +0000
+++ b/bzrlib/tests/per_workingtree/test_unversion.py 2011-05-04 11:15:37 +0000
@@ -18,7 +18,6 @@
from bzrlib import (
errors,
- osutils,
)
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
More information about the bazaar-commits
mailing list