upstream/mercurial-mirror Commit - r38334:565074cc

tests: suppress read(-1) -> '' calls in fileobjectobserver...

Augie Fackler -

r38334:565074cc default

parent child

contrib/python3-whitelist

0 +1 0

             test-sparse.t
             test-split.t
             test-ssh-clone-r.t
+            test-ssh-proto-unbundle.t
             test-ssh-proto.t
             test-sshserver.py
             test-stack.t

mercurial/util.py

0 +7 0

                     if res is None:
                         res = ''
+                    if size == -1 and res == '':
+                        # Suppress pointless read(-1) calls that return
+                        # nothing. These happen _a lot_ on Python 3, and there
+                        # doesn't seem to be a better workaround to have matching
+                        # Python 2 and 3 behavior. :(
+                        return
                     if self.logdataapis:
                         self.fh.write('%s> read(%d) -> %d' % (self.name, size, len(res)))

tests/test-ssh-proto-unbundle.t

0 0 -30

               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 115:
               e>     abort: incompatible Mercurial client; bundle2 required\n
               e>     (see https://www.mercurial-scm.org/wiki/IncompatibleClient)\n
               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 115:
               e>     abort: incompatible Mercurial client; bundle2 required\n
               e>     (see https://www.mercurial-scm.org/wiki/IncompatibleClient)\n
               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 196:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 196:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 218:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 218:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 202:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 202:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 206:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 206:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 232:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 232:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 193:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 193:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 218:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 218:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 216:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 216:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 212:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 212:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 212:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 212:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 230:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 230:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 273:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 0
               result: 0
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 273:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 1
               result: 1
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 100:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 1
               result: 1
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 100:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 1
               result: 1
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 152:
               e>     adding changesets\n
               e>     adding manifests\n
               o> read(1) -> 1: 1
               result: 1
               remote output:
-              o> read(-1) -> 0:
               e> read(-1) -> 152:
               e>     adding changesets\n
               e>     adding manifests\n

tests/test-ssh-proto.t

0 0 -4

               i>     hello\n
               o> readline() -> 1:
               o>     \n
-              o> read(-1) -> 0:
               e> read(-1) -> 42:
               e>     cannot upgrade protocols multiple times\n
               e>     -\n
               i>     invalid\n
               o> readline() -> 1:
               o>     \n
-              o> read(-1) -> 0:
               e> read(-1) -> 46:
               e>     malformed handshake protocol: missing hello\n
               e>     -\n
               i>     invalid\n
               o> readline() -> 1:
               o>     \n
-              o> read(-1) -> 0:
               e> read(-1) -> 48:
               e>     malformed handshake protocol: missing between\n
               e>     -\n
               i>     invalid\n
               o> readline() -> 1:
               o>     \n
-              o> read(-1) -> 0:
               e> read(-1) -> 49:
               e>     malformed handshake protocol: missing pairs 81\n
               e>     -\n

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages