Mercurial > hg
changeset 16481:37e0872b5ced stable
tests: remove race in test-pull-pull-corruption.t
The output from the background process was not always interleaved "correctly"
with output from the foreground process.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Mon, 23 Apr 2012 01:39:26 +0200 |
| parents | 123f96c4d454 |
| children | a5d359b3927a |
| files | tests/test-pull-pull-corruption.t |
| diffstat | 1 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-pull-pull-corruption.t Mon Apr 23 01:39:26 2012 +0200 +++ b/tests/test-pull-pull-corruption.t Mon Apr 23 01:39:26 2012 +0200 @@ -37,26 +37,27 @@ start a pull... - $ hg pull ../source1 & + $ hg pull ../source1 > pull.out 2>&1 & ... and start another pull before the first one has finished $ sleep 1 - pulling from ../source1 - requesting all changes $ hg pull ../source2 2>/dev/null pulling from ../source2 - adding changesets - adding manifests - adding file changes - added 10 changesets with 10 changes to 1 files - (run 'hg update' to get a working copy) searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) + $ cat pull.out + pulling from ../source1 + requesting all changes + adding changesets + adding manifests + adding file changes + added 10 changesets with 10 changes to 1 files + (run 'hg update' to get a working copy) see the result