[PATCH] one more fix in test_diff

[John Arbash Meinel]

Alexander Belchenko wrote:
> blackbox.test_diff fix: don't load plugins when in test bzr run as
> subprocess
> 
> 

Because this was filed under --no-plugins, I didn't realize that you
were also passing 'universal_newlines=True' which *is* important to merge.

Since Aaron already gave a +1 to this change, I'll clean it up and
submit it.

John
=:->


> ------------------------------------------------------------------------
> 
> # Bazaar revision bundle v0.8
> #
> # message:
> #   blackbox.test_diff fix: don't load plugins when in test bzr run as subprocess
> #   
> # committer: Alexander Belchenko <bialix at ukr.net>
> # date: Fri 2006-09-29 14:35:26.617000103 +0300
> 
> === modified file bzrlib/tests/blackbox/test_diff.py
> --- bzrlib/tests/blackbox/test_diff.py
> +++ bzrlib/tests/blackbox/test_diff.py
> @@ -270,8 +270,10 @@
>          orig_progress = os.environ.get('BZR_PROGRESS_BAR')
>          try:
>              os.environ['BZR_PROGRESS_BAR'] = 'none'
> -            out, err = self.run_bzr_subprocess('diff', '-r', '1',
> +            out, err = self.run_bzr_subprocess('--no-plugins',
> +                                               'diff', '-r', '1',
>                                                 '--diff-options', '-ub',
> +                                               universal_newlines=True,
>                                                 retcode=None)
>          finally:
>              if orig_progress is None:
> 
> # revision id: bialix at ukr.net-20060929113526-4b3d862f6f722875
> # sha1: 26098eb32b9a804146f84515de75a1e1e3e9e738
> # inventory sha1: 6d4b97d9f6c26e94519b090399628da79eddc669
> # parent ids:
> #   pqm at pqm.ubuntu.com-20060928161539-3fc7d0f247fcfc5b
> # base id: pqm at pqm.ubuntu.com-20060928161539-3fc7d0f247fcfc5b
> # properties:
> #   branch-nick: test_external_diff.fix
> 
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20061031/3c08e87d/attachment.pgp