Rev 2384: Review feedback. in file:///home/robertc/source/baz/hpss-test-correctness/

Robert Collins robertc at robertcollins.net
Wed Mar 28 23:31:45 BST 2007


At file:///home/robertc/source/baz/hpss-test-correctness/

------------------------------------------------------------
revno: 2384
revision-id: robertc at robertcollins.net-20070328223141-sfyiqllwuimpvj06
parent: robertc at robertcollins.net-20070328133358-wn7wgnzmb0cjohjk
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-test-correctness
timestamp: Thu 2007-03-29 08:31:41 +1000
message:
  Review feedback.
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
  bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
  bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
  bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
  bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2007-03-28 13:33:58 +0000
+++ b/bzrlib/tests/__init__.py	2007-03-28 22:31:41 +0000
@@ -1748,6 +1748,7 @@
         self.overrideEnvironmentForTesting()
         self.__readonly_server = None
         self.__server = None
+        self.reduceLockdirTimeout()
 
      
 class TestCaseInTempDir(TestCaseWithMemoryTransport):
@@ -1979,8 +1980,6 @@
 
     def setUp(self):
         super(ChrootedTestCase, self).setUp()
-        # NB: one HttpServer is taught to decorate properly,
-        # this hack can be removed.
         if not self.vfs_transport_factory == MemoryServer:
             self.transport_readonly_server = HttpServer
 

=== modified file 'bzrlib/tests/branch_implementations/test_branch.py'
--- a/bzrlib/tests/branch_implementations/test_branch.py	2007-03-28 13:33:58 +0000
+++ b/bzrlib/tests/branch_implementations/test_branch.py	2007-03-28 22:31:41 +0000
@@ -120,12 +120,11 @@
         """Test fetch-revision operation."""
         wt = self.make_branch_and_tree('b1')
         b1 = wt.branch
-        b2 = self.make_branch('b2')
-        wt.bzrdir.root_transport.put_bytes('foo', 'hello')
+        self.build_tree_contents([('b1/foo', 'hello')])
         wt.add(['foo'], ['foo-id'])
         wt.commit('lala!', rev_id='revision-1', allow_pointless=False)
 
-        mutter('start fetch')
+        b2 = self.make_branch('b2')
         self.assertEqual((1, []), b2.fetch(b1))
 
         rev = b2.repository.get_revision('revision-1')
@@ -134,11 +133,10 @@
 
     def test_get_revision_delta(self):
         tree_a = self.make_branch_and_tree('a')
-        transport = tree_a.bzrdir.root_transport
-        self.build_tree(['foo'], transport=transport)
+        self.build_tree(['a/foo'])
         tree_a.add('foo', 'file1')
         tree_a.commit('rev1', rev_id='rev1')
-        self.build_tree(['vla'], transport=transport)
+        self.build_tree(['a/vla'])
         tree_a.add('vla', 'file2')
         tree_a.commit('rev2', rev_id='rev2')
 
@@ -152,7 +150,7 @@
     def get_unbalanced_tree_pair(self):
         """Return two branches, a and b, with one file in a."""
         tree_a = self.make_branch_and_tree('a')
-        tree_a.bzrdir.root_transport.put_bytes_non_atomic('b', 'b')
+        self.build_tree_contents([('a/b', 'b')])
         tree_a.add('b')
         tree_a.commit("silly commit", rev_id='A')
 
@@ -181,11 +179,10 @@
         #       what should that behaviour be ? Emailed the list.
         # First, make a branch with two commits.
         wt_a = self.make_branch_and_tree('a')
-        transport = wt_a.bzrdir.root_transport
-        self.build_tree(['one'], transport=transport)
+        self.build_tree(['a/one'])
         wt_a.add(['one'])
         wt_a.commit('commit one', rev_id='1')
-        self.build_tree(['two'], transport=transport)
+        self.build_tree(['a/two'])
         wt_a.add(['two'])
         wt_a.commit('commit two', rev_id='2')
         # Now make a copy of the repository.
@@ -204,10 +201,10 @@
         # test sprouting with a prefix of the revision-history.
         # also needs not-on-revision-history behaviour defined.
         wt_a = self.make_branch_and_tree('a')
-        self.build_tree(['one'], transport=wt_a.bzrdir.root_transport)
+        self.build_tree(['a/one'])
         wt_a.add(['one'])
         wt_a.commit('commit one', rev_id='1')
-        self.build_tree(['two'], transport=wt_a.bzrdir.root_transport)
+        self.build_tree(['a/two'])
         wt_a.add(['two'])
         wt_a.commit('commit two', rev_id='2')
         repo_b = self.make_repository('b')
@@ -218,7 +215,7 @@
 
     def get_parented_branch(self):
         wt_a = self.make_branch_and_tree('a')
-        self.build_tree(['one'], transport=wt_a.bzrdir.root_transport)
+        self.build_tree(['a/one'])
         wt_a.add(['one'])
         wt_a.commit('commit one', rev_id='1')
 
@@ -357,9 +354,7 @@
         explicit nickname is set.  That is, an explicit nickname always
         overrides the implicit one.
         """
-        # Make a branch in a directory called 'bzr.dev'
         t = get_transport(self.get_url())
-        t.mkdir('bzr.dev')
         branch = self.make_branch('bzr.dev')
         # The nick will be 'bzr.dev', because there is no explicit nick set.
         self.assertEqual(branch.nick, 'bzr.dev')
@@ -391,7 +386,6 @@
 
     def test_commit_nicks(self):
         """Nicknames are committed to the revision"""
-        get_transport(self.get_url()).mkdir('bzr.dev')
         wt = self.make_branch_and_tree('bzr.dev')
         branch = wt.branch
         branch.nick = "My happy branch"

=== modified file 'bzrlib/tests/branch_implementations/test_push.py'
--- a/bzrlib/tests/branch_implementations/test_push.py	2007-03-28 07:33:07 +0000
+++ b/bzrlib/tests/branch_implementations/test_push.py	2007-03-28 22:31:41 +0000
@@ -100,7 +100,7 @@
         source = self.make_branch_and_tree('source')
         target = self.make_branch('target')
 
-        self.build_tree(['a'], transport=source.bzrdir.root_transport)
+        self.build_tree(['source/a'])
         source.add(['a'])
         source.commit('a')
 
@@ -132,8 +132,8 @@
         try:
             tree = a_branch.bzrdir.create_workingtree()
         except errors.NotLocalUrl:
-            tree = a_branch.create_checkout('checkout', lightweight=True)
-        self.build_tree(['a'], transport=tree.bzrdir.root_transport)
+            tree = a_branch.create_checkout('repo/tree', lightweight=True)
+        self.build_tree(['repo/tree/a'])
         tree.add(['a'])
         tree.commit('a')
 

=== modified file 'bzrlib/tests/bzrdir_implementations/test_bzrdir.py'
--- a/bzrlib/tests/bzrdir_implementations/test_bzrdir.py	2007-03-28 13:33:58 +0000
+++ b/bzrlib/tests/bzrdir_implementations/test_bzrdir.py	2007-03-28 22:31:41 +0000
@@ -878,7 +878,7 @@
             return
         self.assertRaises(errors.NoRepositoryPresent, dir.open_repository)
         tree = self.createWorkingTreeOrSkip(dir)
-        tree.bzrdir.root_transport.mkdir('subdir')
+        self.build_tree(['source/subdir/'])
         tree.add('subdir')
         target = self.sproutOrSkip(dir, self.get_url('target'))
         self.assertNotEqual(dir.transport.base, target.transport.base)
@@ -904,7 +904,7 @@
             return
         self.assertRaises(errors.NoRepositoryPresent, dir.open_repository)
         tree = self.createWorkingTreeOrSkip(dir)
-        self.build_tree(['foo'], transport=dir.root_transport)
+        self.build_tree(['source/foo'])
         tree.add('foo')
         tree.commit('revision 1', rev_id='1')
         tree.commit('revision 2', rev_id='2', allow_pointless=True)
@@ -927,7 +927,7 @@
         # This smoke test just checks the revision-id is right. Tree specific
         # tests will check corner cases.
         tree = self.make_branch_and_tree('source')
-        self.build_tree(['foo'], transport=tree.bzrdir.root_transport)
+        self.build_tree(['source/foo'])
         tree.add('foo')
         tree.commit('revision 1', rev_id='1')
         tree.commit('revision 2', rev_id='2', allow_pointless=True)
@@ -938,7 +938,7 @@
     def test_sprout_bzrdir_incomplete_source_with_basis(self):
         # ensure that basis really does grab from the basis by having incomplete source
         tree = self.make_branch_and_tree('commit_tree')
-        self.build_tree(['foo'], transport=tree.bzrdir.root_transport)
+        self.build_tree(['commit_tree/foo'])
         tree.add('foo')
         tree.commit('revision 1', rev_id='1')
         source = self.make_branch_and_tree('source')

=== modified file 'bzrlib/tests/repository_implementations/test_commit_builder.py'
--- a/bzrlib/tests/repository_implementations/test_commit_builder.py	2007-03-28 07:33:07 +0000
+++ b/bzrlib/tests/repository_implementations/test_commit_builder.py	2007-03-28 22:31:41 +0000
@@ -88,7 +88,7 @@
         tree = self.make_branch_and_tree(".")
         if tree.branch.repository.supports_rich_root():
             raise tests.TestSkipped('Format requires root')
-        self.build_tree(['foo'], transport=tree.bzrdir.root_transport)
+        self.build_tree(['foo'])
         tree.add('foo', 'foo-id')
         tree.lock_write()
         try:

=== modified file 'bzrlib/tests/repository_implementations/test_fileid_involved.py'
--- a/bzrlib/tests/repository_implementations/test_fileid_involved.py	2007-03-28 07:33:07 +0000
+++ b/bzrlib/tests/repository_implementations/test_fileid_involved.py	2007-03-28 22:31:41 +0000
@@ -28,6 +28,7 @@
 class FileIdInvolvedBase(TestCaseWithRepository):
 
     def touch(self, tree, filename):
+        # use the trees transport to not depend on the tree's location or type.
         tree.bzrdir.root_transport.append_bytes(filename, "appended line\n")
 
     def compare_tree_fileids(self, branch, old_rev, new_rev):
@@ -67,7 +68,7 @@
 
         main_wt = self.make_branch_and_tree('main')
         main_branch = main_wt.branch
-        self.build_tree(["a","b","c"], transport=main_wt.bzrdir.root_transport)
+        self.build_tree(["main/a","main/b","main/c"])
 
         main_wt.add(['a', 'b', 'c'], ['a-file-id-2006-01-01-abcd',
                                  'b-file-id-2006-01-01-defg',
@@ -89,7 +90,7 @@
         bt1 = self.make_branch_and_tree('branch1')
         bt1.pull(main_branch)
         b1 = bt1.branch
-        self.build_tree(["d"], transport=bt1.bzrdir.root_transport)
+        self.build_tree(["branch1/d"])
         bt1.add(['d'], ['file-d'])
         bt1.commit("branch1, Commit one", rev_id="rev-E")
 
@@ -225,7 +226,7 @@
     def test_utf8_file_ids_and_revision_ids(self):
         main_wt = self.make_branch_and_tree('main')
         main_branch = main_wt.branch
-        self.build_tree(["a"], transport=main_wt.bzrdir.root_transport)
+        self.build_tree(["main/a"])
 
         file_id = u'a-f\xedle-id'.encode('utf8')
         main_wt.add(['a'], [file_id])
@@ -255,7 +256,7 @@
         self.branch = None
         main_wt = self.make_branch_and_tree('main')
         main_branch = main_wt.branch
-        self.build_tree(["a","b","c"], transport=main_wt.bzrdir.root_transport)
+        self.build_tree(["main/a","main/b","main/c"])
 
         main_wt.add(['a', 'b', 'c'], ['a-file-id-2006-01-01-abcd',
                                  'b-file-id-2006-01-01-defg',

=== modified file 'bzrlib/tests/repository_implementations/test_repository.py'
--- a/bzrlib/tests/repository_implementations/test_repository.py	2007-03-28 13:33:58 +0000
+++ b/bzrlib/tests/repository_implementations/test_repository.py	2007-03-28 22:31:41 +0000
@@ -73,8 +73,7 @@
         # such as signatures[not tested yet] etc etc.
         # when changing to the current default format.
         tree_a = self.make_branch_and_tree('a')
-        transport = tree_a.bzrdir.root_transport
-        self.build_tree(['foo'], transport=transport)
+        self.build_tree(['a/foo'])
         tree_a.add('foo', 'file1')
         tree_a.commit('rev1', rev_id='rev1')
         bzrdirb = self.make_bzrdir('b')
@@ -184,8 +183,7 @@
         # it is defined as a convenience function with the underlying 
         # functionality provided by an InterRepository
         tree_a = self.make_branch_and_tree('a')
-        transport = tree_a.bzrdir.root_transport
-        self.build_tree(['foo'], transport=transport)
+        self.build_tree(['a/foo'])
         tree_a.add('foo', 'file1')
         tree_a.commit('rev1', rev_id='rev1')
         # fetch with a default limit (grab everything)
@@ -199,8 +197,7 @@
 
     def test_fetch_knit2(self):
         tree_a = self.make_branch_and_tree('a', '')
-        transport = tree_a.bzrdir.root_transport
-        self.build_tree(['foo'], transport=transport)
+        self.build_tree(['a/foo'])
         tree_a.add('foo', 'file1')
         tree_a.commit('rev1', rev_id='rev1')
         # fetch with a default limit (grab everything)
@@ -232,11 +229,10 @@
 
     def test_get_revision_delta(self):
         tree_a = self.make_branch_and_tree('a')
-        transport = tree_a.bzrdir.root_transport
-        self.build_tree(['foo'], transport=transport)
+        self.build_tree(['a/foo'])
         tree_a.add('foo', 'file1')
         tree_a.commit('rev1', rev_id='rev1')
-        self.build_tree(['vla'], transport=transport)
+        self.build_tree(['a/vla'])
         tree_a.add('vla', 'file2')
         tree_a.commit('rev2', rev_id='rev2')
 



More information about the bazaar-commits mailing list