On Thu, Jun 24, 2010 at 4:32 AM, Robert Collins <email address hidden> wrote: [snip] > === modified file 'bzrlib/tests/per_interbranch/test_push.py' > --- bzrlib/tests/per_interbranch/test_push.py 2010-06-17 06:30:22 +0000 > +++ bzrlib/tests/per_interbranch/test_push.py 2010-06-24 08:32:39 +0000 > @@ -19,6 +19,11 @@ > from cStringIO import StringIO > import os > > +from testtools.matchers import ( > + Equals, > + MatchesAny, > + ) > + > from bzrlib import ( > branch, > builtins, > @@ -272,10 +277,14 @@ > calls_after_insert_stream = hpss_call_names[insert_stream_idx:] > # After inserting the stream the client has no reason to query the > # remote graph any further. > - self.assertEqual( > - ['Repository.insert_stream_1.19', 'Repository.insert_stream_1.19', > - 'get', 'Branch.set_last_revision_info', 'Branch.unlock'], > - calls_after_insert_stream) > + bzr_core_trace = Equals( > + ['Repository.insert_stream_1.19', 'Repository.insert_stream_1.19', > + 'get', 'Branch.set_last_revision_info', 'Branch.unlock']) > + bzr_loom_trace = Equals( > + ['Repository.insert_stream_1.19', 'Repository.insert_stream_1.19', > + 'get', 'Branch.set_last_revision_info', 'get', 'Branch.unlock']) > + self.assertThat(calls_after_insert_stream, > + MatchesAny(bzr_core_trace, bzr_loom_trace))
This is probably my ignorance, but bzr_loom_trace and bzr_core_trace look identical. How does this help? Thanks for the forthcoming education. :-)
-John
« Back to merge proposal
On Thu, Jun 24, 2010 at 4:32 AM, Robert Collins tests/per_ interbranch/ test_push. py' tests/per_ interbranch/ test_push. py 2010-06-17 06:30:22 +0000 tests/per_ interbranch/ test_push. py 2010-06-24 08:32:39 +0000 insert_ stream = hpss_call_ names[insert_ stream_ idx:] insert_ stream_ 1.19', 'Repository. insert_ stream_ 1.19', set_last_ revision_ info', 'Branch.unlock'], insert_ stream) insert_ stream_ 1.19', 'Repository. insert_ stream_ 1.19', set_last_ revision_ info', 'Branch.unlock']) insert_ stream_ 1.19', 'Repository. insert_ stream_ 1.19', set_last_ revision_ info', 'get', 'Branch.unlock']) (calls_ after_insert_ stream, bzr_core_ trace, bzr_loom_trace))
<email address hidden> wrote:
[snip]
> === modified file 'bzrlib/
> --- bzrlib/
> +++ bzrlib/
> @@ -19,6 +19,11 @@
> from cStringIO import StringIO
> import os
>
> +from testtools.matchers import (
> + Equals,
> + MatchesAny,
> + )
> +
> from bzrlib import (
> branch,
> builtins,
> @@ -272,10 +277,14 @@
> calls_after_
> # After inserting the stream the client has no reason to query the
> # remote graph any further.
> - self.assertEqual(
> - ['Repository.
> - 'get', 'Branch.
> - calls_after_
> + bzr_core_trace = Equals(
> + ['Repository.
> + 'get', 'Branch.
> + bzr_loom_trace = Equals(
> + ['Repository.
> + 'get', 'Branch.
> + self.assertThat
> + MatchesAny(
This is probably my ignorance, but bzr_loom_trace and bzr_core_trace
look identical. How does this help? Thanks for the forthcoming
education. :-)
-John