[PATCH 3 of 3 evolve-ext] tests: conditionalize some output for Windows

Matt Harbison mharbison72 at gmail.com
Sat Jan 5 01:26:37 UTC 2019 

On Fri, 04 Jan 2019 20:19:44 -0500, Matt Harbison <mharbison72 at gmail.com>  
wrote:

> # HG changeset patch
> # User Matt Harbison <matt_harbison at yahoo.com>
> # Date 1546647458 18000
> #      Fri Jan 04 19:17:38 2019 -0500
> # Node ID 338195079e4312840d0744ed5bf6fb8699dd8dc9
> # Parent  02ef02957d87aaae2cb0185de478af39907a8298
> tests: conditionalize some output for Windows

The remaining 3 failed tests on Windows are something weird with  
bookmarks, something possibly related with the wire protocol, and  
different cache sizes.  I see the sqlite caches are globbed, but I didn't  
want to just glob these too.

--- c:/Users/Matt/projects/hg-evolve/tests/test-pullbundle.t
+++ c:/Users/Matt/projects/hg-evolve/tests/test-pullbundle.t.err
@@ -31,6 +31,7 @@

    $ hg -R client pull server -r 1234 --debug --config  
devel.bundle2.debug=yes | grep -v 'add changese
    pulling from server
+  listing keys for "bookmarks"
    query 1; heads
    pullbundle-cache: "missing" set sliced into 6 subranges in *.* seconds  
(glob)
    1024 changesets found
@@ -39,8 +40,7 @@
    16 changesets found
    2 changesets found
    1 changesets found
-  listing keys for "bookmarks"
-  bundle2-output-bundle: "HG20", 9 parts total
+  bundle2-output-bundle: "HG20", 8 parts total
    bundle2-output: start emission of HG20 stream
    bundle2-output: bundle parameter:
    bundle2-output: start of parts
@@ -85,20 +85,15 @@
    bundle2-output: header chunk size: 41
    bundle2-output: payload chunk size: 196
    bundle2-output: closing payload chunk
-  bundle2-output: bundle part: "listkeys"
-  bundle2-output-part: "listkeys" (params: 1 mandatory) empty payload
-  bundle2-output: part 6: "LISTKEYS"
-  bundle2-output: header chunk size: 35
-  bundle2-output: closing payload chunk
    bundle2-output: bundle part: "phase-heads"
    bundle2-output-part: "phase-heads" 24 bytes payload
-  bundle2-output: part 7: "PHASE-HEADS"
+  bundle2-output: part 6: "PHASE-HEADS"
    bundle2-output: header chunk size: 18
    bundle2-output: payload chunk size: 24
    bundle2-output: closing payload chunk
    bundle2-output: bundle part: "cache:rev-branch-cache"
    bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed  
payload
-  bundle2-output: part 8: "cache:rev-branch-cache"
+  bundle2-output: part 7: "cache:rev-branch-cache"
    bundle2-output: header chunk size: 29
    bundle2-output: payload chunk size: 24719
    bundle2-output: closing payload chunk
@@ -190,16 +185,9 @@
    adding file changes
    added 1 changesets with 0 changes to 0 files
    bundle2-input-part: total payload size 196
-  bundle2-input: part header size: 35
-  bundle2-input: part type: "LISTKEYS"
-  bundle2-input: part id: "6"
-  bundle2-input: part parameters: 1
-  bundle2-input: found a handler for part listkeys
-  bundle2-input-part: "listkeys" (params: 1 mandatory) supported
-  bundle2-input: payload chunk size: 0
    bundle2-input: part header size: 18
    bundle2-input: part type: "PHASE-HEADS"
-  bundle2-input: part id: "7"
+  bundle2-input: part id: "6"
    bundle2-input: part parameters: 0
    bundle2-input: found a handler for part phase-heads
    bundle2-input-part: "phase-heads" supported
@@ -208,7 +196,7 @@
    bundle2-input-part: total payload size 24
    bundle2-input: part header size: 29
    bundle2-input: part type: "cache:rev-branch-cache"
-  bundle2-input: part id: "8"
+  bundle2-input: part id: "7"
    bundle2-input: part parameters: 0
    bundle2-input: found a handler for part cache:rev-branch-cache
    bundle2-input-part: "cache:rev-branch-cache" (advisory) supported
@@ -217,7 +205,7 @@
    bundle2-input-part: total payload size 24719
    bundle2-input: part header size: 0
    bundle2-input: end of bundle2 stream
-  bundle2-input-bundle: 8 parts total
+  bundle2-input-bundle: 7 parts total
    checking for updated bookmarks
    updating the branch cache
    new changesets 1ea73414a91b:f864bc82f6a2

ERROR: test-pullbundle.t output changed

--- c:/Users/Matt/projects/hg-evolve/tests/test-discovery-obshashrange.t
+++  
c:/Users/Matt/projects/hg-evolve/tests/test-discovery-obshashrange.t.err
@@ -1143,10 +1143,10 @@
    updating the branch cache
    invalid branchheads cache (served): tip differs
    $ f -s .hg/cache/evoext*
-  .hg/cache/evoext-depthcache-00: size=96
-  .hg/cache/evoext-firstmerge-00: size=96
+  .hg/cache/evoext-depthcache-00: size=60\r (esc)
+  .hg/cache/evoext-firstmerge-00: size=60\r (esc)
    .hg/cache/evoext-obscache-00: size=73
-  .hg/cache/evoext-stablesortcache-00: size=100
+  .hg/cache/evoext-stablesortcache-00: size=64\r (esc)
    .hg/cache/evoext_obshashrange_v2.sqlite: size=??* (glob)
    .hg/cache/evoext_stablerange_v2.sqlite: size=??* (glob)


ERROR: test-discovery-obshashrange.t output changed

---  
c:/Users/Matt/projects/hg-evolve/tests/test-discovery-obshashrange-cache.t
+++  
c:/Users/Matt/projects/hg-evolve/tests/test-discovery-obshashrange-cache.t.err
@@ -77,20 +77,20 @@
  sever cash is warm

    $ f -s server/.hg/cache/evoext*
-  server/.hg/cache/evoext-depthcache-00: size=88
-  server/.hg/cache/evoext-firstmerge-00: size=88
+  server/.hg/cache/evoext-depthcache-00: size=56\r (esc)
+  server/.hg/cache/evoext-firstmerge-00: size=56\r (esc)
    server/.hg/cache/evoext-obscache-00: size=72
-  server/.hg/cache/evoext-stablesortcache-00: size=92
+  server/.hg/cache/evoext-stablesortcache-00: size=60\r (esc)
    server/.hg/cache/evoext_obshashrange_v2.sqlite: size=?* (glob)
    server/.hg/cache/evoext_stablerange_v2.sqlite: size=?* (glob)

  client cash is warm

    $ f -s main/.hg/cache/evoext*
-  main/.hg/cache/evoext-depthcache-00: size=88
-  main/.hg/cache/evoext-firstmerge-00: size=88
+  main/.hg/cache/evoext-depthcache-00: size=56\r (esc)
+  main/.hg/cache/evoext-firstmerge-00: size=56\r (esc)
    main/.hg/cache/evoext-obscache-00: size=72
-  main/.hg/cache/evoext-stablesortcache-00: size=92
+  main/.hg/cache/evoext-stablesortcache-00: size=60\r (esc)
    main/.hg/cache/evoext_obshashrange_v2.sqlite: size=?* (glob)
    main/.hg/cache/evoext_stablerange_v2.sqlite: size=?* (glob)

@@ -133,10 +133,10 @@
  client cash is warm

    $ f -s main/.hg/cache/evoext*
-  main/.hg/cache/evoext-depthcache-00: size=88
-  main/.hg/cache/evoext-firstmerge-00: size=88
+  main/.hg/cache/evoext-depthcache-00: size=56\r (esc)
+  main/.hg/cache/evoext-firstmerge-00: size=56\r (esc)
    main/.hg/cache/evoext-obscache-00: size=72
-  main/.hg/cache/evoext-stablesortcache-00: size=92
+  main/.hg/cache/evoext-stablesortcache-00: size=60\r (esc)
    main/.hg/cache/evoext_obshashrange_v2.sqlite: size=?* (glob)
    main/.hg/cache/evoext_stablerange_v2.sqlite: size=?* (glob)

@@ -161,9 +161,9 @@
  client cash is warm

    $ f -s main/.hg/cache/evoext*
-  main/.hg/cache/evoext-depthcache-00: size=88
-  main/.hg/cache/evoext-firstmerge-00: size=88
+  main/.hg/cache/evoext-depthcache-00: size=56\r (esc)
+  main/.hg/cache/evoext-firstmerge-00: size=56\r (esc)
    main/.hg/cache/evoext-obscache-00: size=72
-  main/.hg/cache/evoext-stablesortcache-00: size=92
+  main/.hg/cache/evoext-stablesortcache-00: size=60\r (esc)
    main/.hg/cache/evoext_obshashrange_v2.sqlite: size=?* (glob)
    main/.hg/cache/evoext_stablerange_v2.sqlite: size=?* (glob)

More information about the Mercurial-devel mailing list