[MERGE] Convert tests.blackbox.test_f* to use internals where appropriate

Aaron Bentley aaron.bentley at utoronto.ca
Wed Aug 8 19:38:14 BST 2007


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Daniel Watkins wrote:
> I was hoping to introduce these merges at a slower rate, so as not to
> choke the queue too much, but I'm about to go away for the best part of
> two weeks where time and Internet access are likely to be in equally
> short supply so I'm submitting the ones I had waiting locally now.

I don't know a great solution to this.  I'd like to say "If the queue is
too big, that's our problem, not yours".  But the reality is that I'm
trying to ensure that nothing in stays in the queue more than 3 days
without being reviewed.  And that means cleanup submissions will take
time away from other work.

Perhaps it makes sense to stagger the actual work, rather than the
submissions.  Because once the changes have been prepared, effort must
be put into keeping them mergeable, so delay means you do more work.

bb:approve

=== modified file 'bzrlib/tests/blackbox/test_find_merge_base.py'
- --- bzrlib/tests/blackbox/test_find_merge_base.py	2007-06-27 19:13:50
+0000
+++ bzrlib/tests/blackbox/test_find_merge_base.py	2007-08-03 16:01:42 +0000
@@ -21,16 +21,13 @@
 class TestFindMergeBase(ExternalBase):

     def test_find_merge_base(self):
+        a_tree = self.make_branch_and_tree('a')
+        a_tree.commit(message='foo', allow_pointless=True)

^^^ We do not generally specify allow_pointless=True, only
allow_pointless=False.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGug2W0F+nu1YWqI0RAn0xAJ9zqVzzoLoNOgoAON4ChPjESi5WgQCfYUP1
Y1PDwK5uvZ5HWiQYPxRKCKc=
=QopF
-----END PGP SIGNATURE-----



More information about the bazaar mailing list