Merge lp:~lifeless/bzr/loomsupport into lp:bzr

[Robert Collins]

Make the interbranch test_no_get_parent_map_after_insert_stream test work for looms.

test_no_get_parent_map_after_insert_stream is overly sensitive, this
loosens it a little for looms.

[Vincent Ladeuil (vila)]

As said on IRC mentioning loom in core feels dirty, but the commit messageS are good enough to tell
the next maintainer what the problem is about.

review: Approve

[John Szakmeister (jszakmeister)]

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

[Robert Collins (lifeless)]

sent to pqm by email

[Robert Collins (lifeless)]

On Thu, Jun 24, 2010 at 6:40 PM, John Szakmeister <email address hidden> wrote:
> On Thu, Jun 24, 2010 at 4:32 AM, Robert Collins

>> @@ -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. :-)

Its a little subtle, and I could have played list slicing tricks to
make it more obvious, but at a cost in reading each trace, so I did it
the way I did.

here's a side-by-side comparison:
'Repository.insert_stream_1.19', 'Repository.insert_stream_1.19',
'Repository.insert_stream_1.19', 'Repository.insert_stream_1.19',
'get', 'get',
'Branch.set_last_revision_info', 'Branch.set_last_revision_info',
'get',
'Branch.unlock' 'Branch.unlock',

-Rob

[John Szakmeister (jszakmeister)]

On Thu, Jun 24, 2010 at 4:51 AM, Robert Collins
<email address hidden> wrote:
[snip]
> Its a little subtle, and I could have played list slicing tricks to
> make it more obvious, but at a cost in reading each trace, so I did it
> the way I did.
>
> here's a side-by-side comparison:
> 'Repository.insert_stream_1.19',    'Repository.insert_stream_1.19',
> 'Repository.insert_stream_1.19',    'Repository.insert_stream_1.19',
> 'get',                                            'get',
> 'Branch.set_last_revision_info',      'Branch.set_last_revision_info',
> 'get',
> 'Branch.unlock'                             'Branch.unlock',

Bah, I should've seen that. Thank you.

-John

[lp:~lifeless/bzr/loomsupport]

5318. By Canonical.com Patch Queue Manager <email address hidden> on 2010-06-24

(lifeless) Make the interbranch test_no_get_parent_map_after_insert_stream
 test work for looms. (Robert Collins)

=== 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))
 
     def disableOptimisticGetParentMap(self):
         # Tweak some class variables to stop remote get_parent_map calls asking