comparison tests/test-ssh-proto-unbundle.t @ 37943:45a669bad421

test-ssh: add some flush() to make output deterministic

We shouldn't rely on buffering mode/state of file handles.

37942:32bc3815efae

  $ cat > $TESTTMP/failhook << EOF
  > from __future__ import print_function
  > import sys
  > def hook1line(ui, repo, **kwargs):
  >     ui.write(b'ui.write 1 line\n')
  >     return 1
  > def hook2lines(ui, repo, **kwargs):
  >     ui.write(b'ui.write 2 lines 1\n')
  >     ui.write(b'ui.write 2 lines 2\n')
  >     return 1
  > def hook1lineflush(ui, repo, **kwargs):
  >     ui.write(b'ui.write 1 line flush\n')
  >     ui.flush()
  >     return 1

  > def hookwriteandwriteerr(ui, repo, **kwargs):
  >     ui.write(b'ui.write 1\n')
  >     ui.write_err(b'ui.write_err 1\n')
  >     ui.write(b'ui.write 2\n')
  >     ui.write_err(b'ui.write_err 2\n')
  >     return 1
  > def hookprintstdout(ui, repo, **kwargs):
  >     print('printed line')
  >     return 1
  > def hookprintandwrite(ui, repo, **kwargs):
  >     print('print 1')
  >     ui.write(b'ui.write 1\n')
  >     print('print 2')
  >     ui.write(b'ui.write 2\n')
  >     return 1
  > def hookprintstderrandstdout(ui, repo, **kwargs):
  >     print('stdout 1')
  >     print('stderr 1', file=sys.stderr)
  >     print('stdout 2')
  >     print('stderr 2', file=sys.stderr)
  >     return 1
  > EOF

  $ hg init failrepo
  $ cd failrepo

  e> read(-1) -> 218:
  e>     adding changesets\n
  e>     adding manifests\n
  e>     adding file changes\n
  e>     added 1 changesets with 1 changes to 1 files\n
  e>     ui.write 1\n
  e>     ui.write 2\n
  e>     print 1\n
  e>     print 2\n
  e>     transaction abort!\n
  e>     rollback completed\n
  e>     abort: pretxnchangegroup.fail hook failed\n
  
  testing ssh2

  e> read(-1) -> 218:
  e>     adding changesets\n
  e>     adding manifests\n
  e>     adding file changes\n
  e>     added 1 changesets with 1 changes to 1 files\n
  e>     ui.write 1\n
  e>     ui.write 2\n
  e>     print 1\n
  e>     print 2\n
  e>     transaction abort!\n
  e>     rollback completed\n
  e>     abort: pretxnchangegroup.fail hook failed\n

print() to stdout and stderr both get captured

  e> read(-1) -> 216:
  e>     adding changesets\n
  e>     adding manifests\n
  e>     adding file changes\n
  e>     added 1 changesets with 1 changes to 1 files\n
  e>     stderr 1\n
  e>     stderr 2\n
  e>     stdout 1\n
  e>     stdout 2\n
  e>     transaction abort!\n
  e>     rollback completed\n
  e>     abort: pretxnchangegroup.fail hook failed\n
  
  testing ssh2

  e> read(-1) -> 216:
  e>     adding changesets\n
  e>     adding manifests\n
  e>     adding file changes\n
  e>     added 1 changesets with 1 changes to 1 files\n
  e>     stderr 1\n
  e>     stderr 2\n
  e>     stdout 1\n
  e>     stdout 2\n
  e>     transaction abort!\n
  e>     rollback completed\n
  e>     abort: pretxnchangegroup.fail hook failed\n

Shell hook writing to stdout has output captured

  e>     added 1 changesets with 1 changes to 1 files\n
  e>     shell stdout 1\n
  e>     shell stderr 1\n
  e>     shell stdout 2\n
  e>     shell stderr 2\n
  e>     stderr 1\n
  e>     stderr 2\n
  e>     stdout 1\n
  e>     stdout 2\n
  e>     transaction abort!\n
  e>     rollback completed\n
  e>     abort: pretxnchangegroup.b hook failed\n
  
  testing ssh2

  e>     added 1 changesets with 1 changes to 1 files\n
  e>     shell stdout 1\n
  e>     shell stderr 1\n
  e>     shell stdout 2\n
  e>     shell stderr 2\n
  e>     stderr 1\n
  e>     stderr 2\n
  e>     stdout 1\n
  e>     stdout 2\n
  e>     transaction abort!\n
  e>     rollback completed\n
  e>     abort: pretxnchangegroup.b hook failed\n

  $ cd ..

37943:45a669bad421

  $ cat > $TESTTMP/failhook << EOF
  > from __future__ import print_function
  > import sys
  > def hook1line(ui, repo, **kwargs):
  >     ui.write(b'ui.write 1 line\n')
  >     ui.flush()
  >     return 1
  > def hook2lines(ui, repo, **kwargs):
  >     ui.write(b'ui.write 2 lines 1\n')
  >     ui.write(b'ui.write 2 lines 2\n')
  >     ui.flush()
  >     return 1
  > def hook1lineflush(ui, repo, **kwargs):
  >     ui.write(b'ui.write 1 line flush\n')
  >     ui.flush()
  >     return 1

  > def hookwriteandwriteerr(ui, repo, **kwargs):
  >     ui.write(b'ui.write 1\n')
  >     ui.write_err(b'ui.write_err 1\n')
  >     ui.write(b'ui.write 2\n')
  >     ui.write_err(b'ui.write_err 2\n')
  >     ui.flush()
  >     return 1
  > def hookprintstdout(ui, repo, **kwargs):
  >     print('printed line')
  >     sys.stdout.flush()
  >     return 1
  > def hookprintandwrite(ui, repo, **kwargs):
  >     print('print 1')
  >     sys.stdout.flush()
  >     ui.write(b'ui.write 1\n')
  >     ui.flush()
  >     print('print 2')
  >     sys.stdout.flush()
  >     ui.write(b'ui.write 2\n')
  >     ui.flush()
  >     return 1
  > def hookprintstderrandstdout(ui, repo, **kwargs):
  >     print('stdout 1')
  >     sys.stdout.flush()
  >     print('stderr 1', file=sys.stderr)
  >     sys.stderr.flush()
  >     print('stdout 2')
  >     sys.stdout.flush()
  >     print('stderr 2', file=sys.stderr)
  >     sys.stderr.flush()
  >     return 1
  > EOF

  $ hg init failrepo
  $ cd failrepo

  e> read(-1) -> 218:
  e>     adding changesets\n
  e>     adding manifests\n
  e>     adding file changes\n
  e>     added 1 changesets with 1 changes to 1 files\n
  e>     print 1\n
  e>     ui.write 1\n
  e>     print 2\n
  e>     ui.write 2\n
  e>     transaction abort!\n
  e>     rollback completed\n
  e>     abort: pretxnchangegroup.fail hook failed\n
  
  testing ssh2

  e> read(-1) -> 218:
  e>     adding changesets\n
  e>     adding manifests\n
  e>     adding file changes\n
  e>     added 1 changesets with 1 changes to 1 files\n
  e>     print 1\n
  e>     ui.write 1\n
  e>     print 2\n
  e>     ui.write 2\n
  e>     transaction abort!\n
  e>     rollback completed\n
  e>     abort: pretxnchangegroup.fail hook failed\n

print() to stdout and stderr both get captured

  e> read(-1) -> 216:
  e>     adding changesets\n
  e>     adding manifests\n
  e>     adding file changes\n
  e>     added 1 changesets with 1 changes to 1 files\n
  e>     stdout 1\n
  e>     stderr 1\n
  e>     stdout 2\n
  e>     stderr 2\n
  e>     transaction abort!\n
  e>     rollback completed\n
  e>     abort: pretxnchangegroup.fail hook failed\n
  
  testing ssh2

  e> read(-1) -> 216:
  e>     adding changesets\n
  e>     adding manifests\n
  e>     adding file changes\n
  e>     added 1 changesets with 1 changes to 1 files\n
  e>     stdout 1\n
  e>     stderr 1\n
  e>     stdout 2\n
  e>     stderr 2\n
  e>     transaction abort!\n
  e>     rollback completed\n
  e>     abort: pretxnchangegroup.fail hook failed\n

Shell hook writing to stdout has output captured

  e>     added 1 changesets with 1 changes to 1 files\n
  e>     shell stdout 1\n
  e>     shell stderr 1\n
  e>     shell stdout 2\n
  e>     shell stderr 2\n
  e>     stdout 1\n
  e>     stderr 1\n
  e>     stdout 2\n
  e>     stderr 2\n
  e>     transaction abort!\n
  e>     rollback completed\n
  e>     abort: pretxnchangegroup.b hook failed\n
  
  testing ssh2

  e>     added 1 changesets with 1 changes to 1 files\n
  e>     shell stdout 1\n
  e>     shell stderr 1\n
  e>     shell stdout 2\n
  e>     shell stderr 2\n
  e>     stdout 1\n
  e>     stderr 1\n
  e>     stdout 2\n
  e>     stderr 2\n
  e>     transaction abort!\n
  e>     rollback completed\n
  e>     abort: pretxnchangegroup.b hook failed\n

  $ cd ..