Diff of the two buildlogs: -- --- b1/build.log 2025-03-01 23:24:39.188670863 +0000 +++ b2/build.log 2025-03-01 23:30:54.147795208 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Sat Mar 1 11:15:24 -12 2025 -I: pbuilder-time-stamp: 1740870924 +I: Current time: Sat Apr 4 19:47:43 +14 2026 +I: pbuilder-time-stamp: 1775281663 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/trixie-reproducible-base.tgz] I: copying local configuration @@ -24,52 +24,84 @@ dpkg-source: info: applying 0001-Update-json.patch-imports-and-skip-testPatchCreation.patch I: Not using root during the build. I: Installing the build-deps -I: user script /srv/workspace/pbuilder/4065331/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/799826/tmp/hooks/D01_modify_environment starting +debug: Running on ionos5-amd64. +I: Changing host+domainname to test build reproducibility +I: Adding a custom variable just for the fun of it... +I: Changing /bin/sh to bash +'/bin/sh' -> '/bin/bash' +lrwxrwxrwx 1 root root 9 Apr 4 05:48 /bin/sh -> /bin/bash +I: Setting pbuilder2's login shell to /bin/bash +I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other +I: user script /srv/workspace/pbuilder/799826/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/799826/tmp/hooks/D02_print_environment starting I: set - BUILDDIR='/build/reproducible-path' - BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other' - BUILDUSERNAME='pbuilder1' - BUILD_ARCH='amd64' - DEBIAN_FRONTEND='noninteractive' - DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=20 ' - DISTRIBUTION='trixie' - HOME='/root' - HOST_ARCH='amd64' + BASH=/bin/sh + BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath + BASH_ALIASES=() + BASH_ARGC=() + BASH_ARGV=() + BASH_CMDS=() + BASH_LINENO=([0]="12" [1]="0") + BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:. + BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment") + BASH_VERSINFO=([0]="5" [1]="2" [2]="37" [3]="1" [4]="release" [5]="x86_64-pc-linux-gnu") + BASH_VERSION='5.2.37(1)-release' + BUILDDIR=/build/reproducible-path + BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other' + BUILDUSERNAME=pbuilder2 + BUILD_ARCH=amd64 + DEBIAN_FRONTEND=noninteractive + DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=42 ' + DIRSTACK=() + DISTRIBUTION=trixie + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=x86_64 + HOST_ARCH=amd64 IFS=' ' - INVOCATION_ID='9a601ec820ce423cb53a37ee1a431da7' - LANG='C' - LANGUAGE='en_US:en' - LC_ALL='C' - MAIL='/var/mail/root' - OPTIND='1' - PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games' - PBCURRENTCOMMANDLINEOPERATION='build' - PBUILDER_OPERATION='build' - PBUILDER_PKGDATADIR='/usr/share/pbuilder' - PBUILDER_PKGLIBDIR='/usr/lib/pbuilder' - PBUILDER_SYSCONFDIR='/etc' - PPID='4065331' - PS1='# ' - PS2='> ' + INVOCATION_ID=0585e756566f4ea29650945e8df821e4 + LANG=C + LANGUAGE=et_EE:et + LC_ALL=C + MACHTYPE=x86_64-pc-linux-gnu + MAIL=/var/mail/root + OPTERR=1 + OPTIND=1 + OSTYPE=linux-gnu + PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path + PBCURRENTCOMMANDLINEOPERATION=build + PBUILDER_OPERATION=build + PBUILDER_PKGDATADIR=/usr/share/pbuilder + PBUILDER_PKGLIBDIR=/usr/lib/pbuilder + PBUILDER_SYSCONFDIR=/etc + PIPESTATUS=([0]="0") + POSIXLY_CORRECT=y + PPID=799826 PS4='+ ' - PWD='/' - SHELL='/bin/bash' - SHLVL='2' - SUDO_COMMAND='/usr/bin/timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.poOdinX8/pbuilderrc_ygnM --distribution trixie --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/trixie-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.poOdinX8/b1 --logfile b1/build.log golang-k8s-apimachinery_0.31.4-1.dsc' - SUDO_GID='111' - SUDO_UID='106' - SUDO_USER='jenkins' - TERM='unknown' - TZ='/usr/share/zoneinfo/Etc/GMT+12' - USER='root' - _='/usr/bin/systemd-run' - http_proxy='http://46.16.76.132:3128' + PWD=/ + SHELL=/bin/bash + SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix + SHLVL=3 + SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.poOdinX8/pbuilderrc_fGaY --distribution trixie --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/trixie-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.poOdinX8/b2 --logfile b2/build.log golang-k8s-apimachinery_0.31.4-1.dsc' + SUDO_GID=110 + SUDO_UID=105 + SUDO_USER=jenkins + TERM=unknown + TZ=/usr/share/zoneinfo/Etc/GMT-14 + UID=0 + USER=root + _='I: set' + http_proxy=http://213.165.73.152:3128 I: uname -a - Linux ionos11-amd64 6.1.0-31-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.128-1 (2025-02-07) x86_64 GNU/Linux + Linux i-capture-the-hostname 6.12.9+bpo-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.12.9-1~bpo12+1 (2025-01-19) x86_64 GNU/Linux I: ls -l /bin - lrwxrwxrwx 1 root root 7 Nov 22 14:40 /bin -> usr/bin -I: user script /srv/workspace/pbuilder/4065331/tmp/hooks/D02_print_environment finished + lrwxrwxrwx 1 root root 7 Nov 22 2024 /bin -> usr/bin +I: user script /srv/workspace/pbuilder/799826/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -269,7 +301,7 @@ Get: 112 http://deb.debian.org/debian trixie/main amd64 golang-k8s-sigs-structured-merge-diff-dev all 4.4.1+ds1-1 [152 kB] Get: 113 http://deb.debian.org/debian trixie/main amd64 golang-k8s-utils-dev all 0.0~git20241210.24370be-1 [92.8 kB] Get: 114 http://deb.debian.org/debian trixie/main amd64 golang-k8s-kube-openapi-dev all 0.0~git20231214.ab13479-3 [1012 kB] -Fetched 89.0 MB in 7s (12.4 MB/s) +Fetched 89.0 MB in 3s (29.2 MB/s) Preconfiguring packages ... Selecting previously unselected package sensible-utils. (Reading database ... (Reading database ... 5% (Reading database ... 10% (Reading database ... 15% (Reading database ... 20% (Reading database ... 25% (Reading database ... 30% (Reading database ... 35% (Reading database ... 40% (Reading database ... 45% (Reading database ... 50% (Reading database ... 55% (Reading database ... 60% (Reading database ... 65% (Reading database ... 70% (Reading database ... 75% (Reading database ... 80% (Reading database ... 85% (Reading database ... 90% (Reading database ... 95% (Reading database ... 100% (Reading database ... 19802 files and directories currently installed.) @@ -740,7 +772,11 @@ Building tag database... -> Finished parsing the build-deps I: Building the package -I: Running cd /build/reproducible-path/golang-k8s-apimachinery-0.31.4/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-genchanges -S > ../golang-k8s-apimachinery_0.31.4-1_source.changes +I: user script /srv/workspace/pbuilder/799826/tmp/hooks/A99_set_merged_usr starting +Not re-configuring usrmerge for trixie +I: user script /srv/workspace/pbuilder/799826/tmp/hooks/A99_set_merged_usr finished +hostname: Name or service not known +I: Running cd /build/reproducible-path/golang-k8s-apimachinery-0.31.4/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-genchanges -S > ../golang-k8s-apimachinery_0.31.4-1_source.changes dpkg-buildpackage: info: source package golang-k8s-apimachinery dpkg-buildpackage: info: source version 0.31.4-1 dpkg-buildpackage: info: source distribution unstable @@ -759,134 +795,134 @@ dh_auto_configure -O--builddirectory=_build -O--buildsystem=golang dh_auto_build -O--builddirectory=_build -O--buildsystem=golang dh_auto_build: warning: k8s.io/apimachinery/pkg/runtime/serializer/recognizer/testing contains no non-test Go files, removing it from build - cd _build && go install -trimpath -v -p 20 k8s.io/apimachinery k8s.io/apimachinery/pkg/api/apitesting k8s.io/apimachinery/pkg/api/apitesting/fuzzer k8s.io/apimachinery/pkg/api/apitesting/naming k8s.io/apimachinery/pkg/api/apitesting/roundtrip k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/api/meta k8s.io/apimachinery/pkg/api/meta/table k8s.io/apimachinery/pkg/api/meta/testrestmapper k8s.io/apimachinery/pkg/api/resource k8s.io/apimachinery/pkg/api/validation k8s.io/apimachinery/pkg/api/validation/path k8s.io/apimachinery/pkg/apis/meta/fuzzer k8s.io/apimachinery/pkg/apis/meta/internalversion k8s.io/apimachinery/pkg/apis/meta/internalversion/scheme k8s.io/apimachinery/pkg/apis/meta/internalversion/validation k8s.io/apimachinery/pkg/apis/meta/v1 k8s.io/apimachinery/pkg/apis/meta/v1/unstructured k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructuredscheme k8s.io/apimachinery/pkg/apis/meta/v1/validation k8s.io/apimachinery/pkg/apis/meta/v1beta1 k8s.io/apimachinery/pkg/apis/meta/v1beta1/validation k8s.io/apimachinery/pkg/apis/testapigroup k8s.io/apimachinery/pkg/apis/testapigroup/fuzzer k8s.io/apimachinery/pkg/apis/testapigroup/install k8s.io/apimachinery/pkg/apis/testapigroup/v1 k8s.io/apimachinery/pkg/conversion k8s.io/apimachinery/pkg/conversion/queryparams k8s.io/apimachinery/pkg/fields k8s.io/apimachinery/pkg/labels k8s.io/apimachinery/pkg/runtime k8s.io/apimachinery/pkg/runtime/schema k8s.io/apimachinery/pkg/runtime/serializer k8s.io/apimachinery/pkg/runtime/serializer/cbor k8s.io/apimachinery/pkg/runtime/serializer/cbor/direct k8s.io/apimachinery/pkg/runtime/serializer/cbor/internal/modes k8s.io/apimachinery/pkg/runtime/serializer/json k8s.io/apimachinery/pkg/runtime/serializer/protobuf k8s.io/apimachinery/pkg/runtime/serializer/recognizer k8s.io/apimachinery/pkg/runtime/serializer/streaming k8s.io/apimachinery/pkg/runtime/serializer/versioning k8s.io/apimachinery/pkg/runtime/serializer/yaml k8s.io/apimachinery/pkg/runtime/testing k8s.io/apimachinery/pkg/selection k8s.io/apimachinery/pkg/test k8s.io/apimachinery/pkg/types k8s.io/apimachinery/pkg/util/cache k8s.io/apimachinery/pkg/util/diff k8s.io/apimachinery/pkg/util/dump k8s.io/apimachinery/pkg/util/duration k8s.io/apimachinery/pkg/util/errors k8s.io/apimachinery/pkg/util/framer k8s.io/apimachinery/pkg/util/httpstream k8s.io/apimachinery/pkg/util/httpstream/spdy k8s.io/apimachinery/pkg/util/httpstream/wsstream k8s.io/apimachinery/pkg/util/intstr k8s.io/apimachinery/pkg/util/json k8s.io/apimachinery/pkg/util/jsonmergepatch k8s.io/apimachinery/pkg/util/managedfields k8s.io/apimachinery/pkg/util/managedfields/internal k8s.io/apimachinery/pkg/util/managedfields/internal/testing k8s.io/apimachinery/pkg/util/managedfields/managedfieldstest k8s.io/apimachinery/pkg/util/mergepatch k8s.io/apimachinery/pkg/util/naming k8s.io/apimachinery/pkg/util/net k8s.io/apimachinery/pkg/util/net/testing k8s.io/apimachinery/pkg/util/portforward k8s.io/apimachinery/pkg/util/proxy k8s.io/apimachinery/pkg/util/rand k8s.io/apimachinery/pkg/util/remotecommand k8s.io/apimachinery/pkg/util/runtime k8s.io/apimachinery/pkg/util/sets k8s.io/apimachinery/pkg/util/strategicpatch k8s.io/apimachinery/pkg/util/strategicpatch/testing k8s.io/apimachinery/pkg/util/uuid k8s.io/apimachinery/pkg/util/validation k8s.io/apimachinery/pkg/util/validation/field k8s.io/apimachinery/pkg/util/version k8s.io/apimachinery/pkg/util/wait k8s.io/apimachinery/pkg/util/waitgroup k8s.io/apimachinery/pkg/util/yaml k8s.io/apimachinery/pkg/version k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -k8s.io/apimachinery + cd _build && go install -trimpath -v -p 42 k8s.io/apimachinery k8s.io/apimachinery/pkg/api/apitesting k8s.io/apimachinery/pkg/api/apitesting/fuzzer k8s.io/apimachinery/pkg/api/apitesting/naming k8s.io/apimachinery/pkg/api/apitesting/roundtrip k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/api/meta k8s.io/apimachinery/pkg/api/meta/table k8s.io/apimachinery/pkg/api/meta/testrestmapper k8s.io/apimachinery/pkg/api/resource k8s.io/apimachinery/pkg/api/validation k8s.io/apimachinery/pkg/api/validation/path k8s.io/apimachinery/pkg/apis/meta/fuzzer k8s.io/apimachinery/pkg/apis/meta/internalversion k8s.io/apimachinery/pkg/apis/meta/internalversion/scheme k8s.io/apimachinery/pkg/apis/meta/internalversion/validation k8s.io/apimachinery/pkg/apis/meta/v1 k8s.io/apimachinery/pkg/apis/meta/v1/unstructured k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructuredscheme k8s.io/apimachinery/pkg/apis/meta/v1/validation k8s.io/apimachinery/pkg/apis/meta/v1beta1 k8s.io/apimachinery/pkg/apis/meta/v1beta1/validation k8s.io/apimachinery/pkg/apis/testapigroup k8s.io/apimachinery/pkg/apis/testapigroup/fuzzer k8s.io/apimachinery/pkg/apis/testapigroup/install k8s.io/apimachinery/pkg/apis/testapigroup/v1 k8s.io/apimachinery/pkg/conversion k8s.io/apimachinery/pkg/conversion/queryparams k8s.io/apimachinery/pkg/fields k8s.io/apimachinery/pkg/labels k8s.io/apimachinery/pkg/runtime k8s.io/apimachinery/pkg/runtime/schema k8s.io/apimachinery/pkg/runtime/serializer k8s.io/apimachinery/pkg/runtime/serializer/cbor k8s.io/apimachinery/pkg/runtime/serializer/cbor/direct k8s.io/apimachinery/pkg/runtime/serializer/cbor/internal/modes k8s.io/apimachinery/pkg/runtime/serializer/json k8s.io/apimachinery/pkg/runtime/serializer/protobuf k8s.io/apimachinery/pkg/runtime/serializer/recognizer k8s.io/apimachinery/pkg/runtime/serializer/streaming k8s.io/apimachinery/pkg/runtime/serializer/versioning k8s.io/apimachinery/pkg/runtime/serializer/yaml k8s.io/apimachinery/pkg/runtime/testing k8s.io/apimachinery/pkg/selection k8s.io/apimachinery/pkg/test k8s.io/apimachinery/pkg/types k8s.io/apimachinery/pkg/util/cache k8s.io/apimachinery/pkg/util/diff k8s.io/apimachinery/pkg/util/dump k8s.io/apimachinery/pkg/util/duration k8s.io/apimachinery/pkg/util/errors k8s.io/apimachinery/pkg/util/framer k8s.io/apimachinery/pkg/util/httpstream k8s.io/apimachinery/pkg/util/httpstream/spdy k8s.io/apimachinery/pkg/util/httpstream/wsstream k8s.io/apimachinery/pkg/util/intstr k8s.io/apimachinery/pkg/util/json k8s.io/apimachinery/pkg/util/jsonmergepatch k8s.io/apimachinery/pkg/util/managedfields k8s.io/apimachinery/pkg/util/managedfields/internal k8s.io/apimachinery/pkg/util/managedfields/internal/testing k8s.io/apimachinery/pkg/util/managedfields/managedfieldstest k8s.io/apimachinery/pkg/util/mergepatch k8s.io/apimachinery/pkg/util/naming k8s.io/apimachinery/pkg/util/net k8s.io/apimachinery/pkg/util/net/testing k8s.io/apimachinery/pkg/util/portforward k8s.io/apimachinery/pkg/util/proxy k8s.io/apimachinery/pkg/util/rand k8s.io/apimachinery/pkg/util/remotecommand k8s.io/apimachinery/pkg/util/runtime k8s.io/apimachinery/pkg/util/sets k8s.io/apimachinery/pkg/util/strategicpatch k8s.io/apimachinery/pkg/util/strategicpatch/testing k8s.io/apimachinery/pkg/util/uuid k8s.io/apimachinery/pkg/util/validation k8s.io/apimachinery/pkg/util/validation/field k8s.io/apimachinery/pkg/util/version k8s.io/apimachinery/pkg/util/wait k8s.io/apimachinery/pkg/util/waitgroup k8s.io/apimachinery/pkg/util/yaml k8s.io/apimachinery/pkg/version k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect +internal/godebugs internal/goarch -internal/profilerecord internal/coverage/rtcov +k8s.io/apimachinery/pkg/types internal/byteorder -encoding +log/slog/internal +internal/profilerecord +unicode/utf8 internal/itoa -internal/goos internal/goexperiment +k8s.io/apimachinery/pkg/util/portforward +log/internal +github.com/google/go-cmp/cmp/internal/flags internal/unsafeheader -unicode +k8s.io/apimachinery +github.com/onsi/ginkgo/v2/config internal/asan -internal/godebugs -internal/runtime/atomic -internal/cpu -internal/msan -internal/abi +k8s.io/apimachinery/pkg/selection math/bits -sync/atomic -internal/runtime/math -cmp -internal/runtime/syscall -internal/runtime/sys -unicode/utf8 -unicode/utf16 -log/internal -log/slog/internal -internal/chacha8rand -container/list +internal/runtime/atomic crypto/internal/fips140/alias -crypto/internal/fips140deps/byteorder +encoding crypto/internal/boring/sig -vendor/golang.org/x/crypto/cryptobyte/asn1 vendor/golang.org/x/crypto/internal/alias -internal/nettrace -k8s.io/apimachinery/pkg/selection +unicode/utf16 +internal/msan +internal/runtime/syscall +sync/atomic +unicode k8s.io/utils/strings/slices -k8s.io/apimachinery/pkg/types -crypto/internal/fips140/subtle -google.golang.org/protobuf/internal/flags -github.com/google/go-cmp/cmp/internal/flags +internal/goos +internal/cpu +vendor/golang.org/x/crypto/cryptobyte/asn1 golang.org/x/net/html/atom -k8s.io/apimachinery/pkg/util/portforward -github.com/onsi/ginkgo/v2/config +cmp +google.golang.org/protobuf/internal/flags +internal/nettrace +container/list +internal/runtime/math +internal/abi +crypto/internal/fips140/subtle +crypto/internal/fips140deps/byteorder +internal/chacha8rand +internal/runtime/sys google.golang.org/protobuf/internal/set -internal/bytealg +internal/runtime/exithook crypto/internal/fips140deps/cpu math -internal/runtime/exithook +internal/bytealg internal/stringslite internal/race -internal/runtime/maps internal/sync +internal/runtime/maps runtime -internal/reflectlite -iter -sync -k8s.io/klog/internal/dbg crypto/subtle +k8s.io/klog/internal/dbg weak -slices +iter +internal/reflectlite +sync maps +slices +errors +sort +internal/oserror +path +math/rand/v2 +vendor/golang.org/x/net/dns/dnsmessage +strconv +io internal/bisect internal/testlog log/slog/internal/buffer -internal/singleflight +syscall +google.golang.org/protobuf/internal/pragma unique github.com/josharian/intern -google.golang.org/protobuf/internal/pragma -errors -sort +internal/singleflight runtime/cgo -strconv -internal/oserror -io -path internal/godebug -math/rand/v2 -syscall bytes strings -vendor/golang.org/x/net/dns/dnsmessage -math/rand +k8s.io/apimachinery/pkg/util/sets github.com/gogo/protobuf/sortkeys -hash +github.com/x448/float16 +internal/saferio container/heap +hash crypto/internal/randutil -internal/saferio -k8s.io/apimachinery/pkg/util/sets -crypto/internal/fips140deps/godebug encoding/base32 -github.com/x448/float16 -net/netip reflect hash/crc32 crypto hash/fnv +net/netip hash/adler32 vendor/golang.org/x/text/transform golang.org/x/text/transform bufio -regexp/syntax -html go/build/constraint k8s.io/klog/internal/severity -crypto/internal/fips140 crypto/internal/impl net/http/internal/ascii -crypto/tls/internal/fips140tls +html +regexp/syntax +crypto/internal/fips140deps/godebug +math/rand +crypto/internal/fips140 +crypto/internal/fips140/sha256 crypto/internal/fips140/sha3 crypto/internal/fips140/sha512 -crypto/internal/fips140/sha256 -crypto/internal/fips140/hmac +crypto/tls/internal/fips140tls +internal/syscall/unix +internal/syscall/execenv +time crypto/sha3 +crypto/internal/fips140/hmac crypto/internal/fips140/check crypto/internal/fips140hash +regexp crypto/internal/fips140/edwards25519/field -crypto/internal/fips140/hkdf -crypto/internal/fips140/bigmod crypto/internal/fips140/aes +crypto/internal/fips140/bigmod +crypto/internal/fips140/hkdf crypto/internal/fips140/tls12 crypto/internal/fips140/nistec/fiat crypto/internal/fips140/tls13 -regexp -internal/syscall/execenv -internal/syscall/unix -time crypto/internal/fips140/edwards25519 k8s.io/apimachinery/pkg/version io/fs @@ -897,205 +933,205 @@ k8s.io/utils/clock github.com/mxk/go-flowrate/flowrate k8s.io/apimachinery/pkg/util/rand -crypto/internal/fips140/nistec k8s.io/apimachinery/pkg/util/cache internal/filepathlite embed +crypto/internal/fips140/nistec +google.golang.org/protobuf/internal/editiondefaults internal/fmtsort encoding/binary -github.com/modern-go/reflect2 github.com/google/go-cmp/cmp/internal/function +github.com/modern-go/reflect2 sigs.k8s.io/structured-merge-diff/schema -google.golang.org/protobuf/internal/editiondefaults os -encoding/base64 vendor/golang.org/x/crypto/internal/poly1305 github.com/google/gofuzz/bytesource +encoding/base64 golang.org/x/sys/unix encoding/pem -path/filepath +fmt internal/lazyregexp +path/filepath +k8s.io/klog/internal/buffer crypto/internal/sysrand -fmt vendor/golang.org/x/sys/cpu io/ioutil -k8s.io/klog/internal/buffer google.golang.org/protobuf/internal/detrand -internal/sysinfo os/signal +internal/sysinfo net crypto/internal/entropy crypto/internal/fips140/drbg -crypto/internal/fips140/aes/gcm crypto/internal/fips140only crypto/internal/fips140/ecdh crypto/internal/fips140/ecdsa crypto/internal/fips140/ed25519 crypto/internal/fips140/mlkem +crypto/internal/fips140/aes/gcm crypto/internal/fips140/rsa -crypto/md5 -crypto/rc4 os/exec +crypto/rc4 +crypto/md5 crypto/cipher -crypto/internal/boring crypto/des vendor/golang.org/x/crypto/chacha20 -crypto/aes -crypto/sha512 -crypto/ecdh -crypto/hmac -crypto/sha1 -crypto/sha256 -vendor/golang.org/x/crypto/chacha20poly1305 -encoding/json +crypto/internal/boring log -go/token -k8s.io/apimachinery/third_party/forked/golang/reflect -go/doc/comment net/url +k8s.io/apimachinery/third_party/forked/golang/reflect encoding/hex k8s.io/apimachinery/pkg/util/errors -flag -os/user +go/token math/big -compress/flate -runtime/debug -vendor/golang.org/x/net/http2/hpack -vendor/golang.org/x/text/unicode/norm -mime -mime/quotedprintable +go/doc/comment net/http/internal -gopkg.in/yaml.v2 -sigs.k8s.io/yaml/goyaml.v2 -go/scanner -github.com/google/gofuzz +mime/quotedprintable +vendor/golang.org/x/net/http2/hpack k8s.io/apimachinery/pkg/fields -vendor/golang.org/x/text/unicode/bidi -k8s.io/apimachinery/pkg/conversion -k8s.io/apimachinery/pkg/util/naming -k8s.io/apimachinery/pkg/util/validation/field -github.com/modern-go/concurrent -golang.org/x/text/unicode/bidi -k8s.io/apimachinery/pkg/conversion/queryparams -golang.org/x/text/unicode/norm -go/ast -golang.org/x/net/http2/hpack -compress/gzip -k8s.io/utils/ptr -google.golang.org/protobuf/internal/errors google.golang.org/protobuf/internal/version +k8s.io/utils/ptr github.com/google/go-cmp/cmp/internal/value encoding/csv -github.com/davecgh/go-spew/spew -runtime/trace -google.golang.org/protobuf/encoding/protowire -testing -github.com/google/go-cmp/cmp -google.golang.org/protobuf/reflect/protoreflect +google.golang.org/protobuf/internal/errors k8s.io/apimachinery/pkg/util/duration -k8s.io/apimachinery/pkg/api/validation/path -text/tabwriter -vendor/golang.org/x/text/secure/bidirule -compress/zlib +runtime/trace +github.com/google/gofuzz +mime +runtime/debug golang.org/x/net/html -k8s.io/apimachinery/third_party/forked/golang/netutil +flag +k8s.io/apimachinery/pkg/api/validation/path +os/user github.com/pkg/errors gopkg.in/yaml.v3 -github.com/go-openapi/jsonreference/internal github.com/onsi/ginkgo/v2/formatter +crypto/aes +text/tabwriter +golang.org/x/net/http2/hpack +compress/flate +encoding/json +golang.org/x/text/unicode/norm +gopkg.in/yaml.v2 +vendor/golang.org/x/text/unicode/norm +sigs.k8s.io/yaml/goyaml.v2 +crypto/sha512 +crypto/hmac +crypto/ecdh +crypto/sha256 +crypto/sha1 +google.golang.org/protobuf/encoding/protowire +github.com/davecgh/go-spew/spew k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json -golang.org/x/text/secure/bidirule encoding/xml encoding/gob +vendor/golang.org/x/crypto/chacha20poly1305 text/template/parse k8s.io/apimachinery/third_party/forked/golang/json -vendor/golang.org/x/net/idna -k8s.io/apimachinery/pkg/util/dump database/sql/driver k8s.io/apimachinery/pkg/util/version k8s.io/apimachinery/pkg/util/waitgroup +google.golang.org/protobuf/reflect/protoreflect +k8s.io/apimachinery/pkg/util/validation/field +k8s.io/apimachinery/pkg/conversion +github.com/google/go-cmp/cmp +go/scanner +k8s.io/apimachinery/pkg/util/naming +github.com/modern-go/concurrent +vendor/golang.org/x/text/unicode/bidi +golang.org/x/text/unicode/bidi +k8s.io/apimachinery/pkg/conversion/queryparams +k8s.io/apimachinery/third_party/forked/golang/netutil +github.com/go-openapi/jsonreference/internal +k8s.io/apimachinery/pkg/util/dump +go/ast +testing +compress/gzip +compress/zlib +text/template +golang.org/x/text/secure/bidirule +vendor/golang.org/x/text/secure/bidirule golang.org/x/net/idna +google.golang.org/protobuf/internal/encoding/messageset +google.golang.org/protobuf/internal/strs +google.golang.org/protobuf/internal/genid +google.golang.org/protobuf/internal/order +google.golang.org/protobuf/runtime/protoiface +google.golang.org/protobuf/internal/descopts +google.golang.org/protobuf/internal/descfmt +google.golang.org/protobuf/reflect/protoregistry +vendor/golang.org/x/net/idna +google.golang.org/protobuf/internal/encoding/text +k8s.io/apimachinery/pkg/util/framer +sigs.k8s.io/yaml +github.com/evanphx/json-patch/v5 +github.com/gogo/protobuf/proto sigs.k8s.io/json/internal/golang/encoding/json log/slog -github.com/gogo/protobuf/proto -k8s.io/apimachinery/pkg/util/framer -google.golang.org/protobuf/internal/encoding/messageset -github.com/fxamacker/cbor -go/doc -go/parser +github.com/onsi/ginkgo/v2/types +github.com/mailru/easyjson/jlexer crypto/rand +github.com/fxamacker/cbor crypto/elliptic crypto/internal/boring/bbig +crypto/dsa +gopkg.in/inf.v0 +go/doc +go/parser encoding/asn1 +github.com/json-iterator/go +k8s.io/apimachinery/pkg/util/diff crypto/ed25519 crypto/internal/hpke crypto/rsa -crypto/dsa -github.com/json-iterator/go -sigs.k8s.io/yaml -gopkg.in/inf.v0 -google.golang.org/protobuf/internal/strs -google.golang.org/protobuf/internal/genid -google.golang.org/protobuf/internal/order -google.golang.org/protobuf/reflect/protoregistry -google.golang.org/protobuf/runtime/protoiface -google.golang.org/protobuf/internal/encoding/text -google.golang.org/protobuf/internal/descfmt -google.golang.org/protobuf/internal/descopts -k8s.io/apimachinery/pkg/util/diff -github.com/evanphx/json-patch/v5 -github.com/mailru/easyjson/jlexer +google.golang.org/protobuf/proto +github.com/google/gnostic-models/jsonschema +html/template +google.golang.org/protobuf/internal/encoding/defval k8s.io/apimachinery/pkg/util/mergepatch -github.com/onsi/ginkgo/v2/types -text/template +crypto/x509/pkix +vendor/golang.org/x/crypto/cryptobyte github.com/go-logr/logr k8s.io/klog/internal/sloghandler -vendor/golang.org/x/crypto/cryptobyte -crypto/x509/pkix -google.golang.org/protobuf/proto -google.golang.org/protobuf/internal/encoding/defval +google.golang.org/protobuf/internal/filedesc +google.golang.org/protobuf/encoding/prototext k8s.io/klog/internal/serialize github.com/go-logr/logr/funcr -github.com/google/gnostic-models/jsonschema -k8s.io/klog crypto/ecdsa +k8s.io/klog +github.com/onsi/ginkgo/v2/reporters sigs.k8s.io/json k8s.io/apimachinery/pkg/util/json k8s.io/apimachinery/pkg/util/yaml k8s.io/apimachinery/pkg/util/jsonmergepatch -google.golang.org/protobuf/encoding/prototext -google.golang.org/protobuf/internal/filedesc -html/template k8s.io/apimachinery/pkg/runtime/serializer/cbor/internal/modes -github.com/onsi/ginkgo/v2/reporters -k8s.io/apimachinery/pkg/runtime/serializer/cbor/direct google.golang.org/protobuf/internal/encoding/tag -sigs.k8s.io/structured-merge-diff/value google.golang.org/protobuf/internal/impl -k8s.io/apimachinery/pkg/runtime/schema -k8s.io/apimachinery/pkg/util/intstr -k8s.io/apimachinery/pkg/api/resource -vendor/golang.org/x/net/http/httpproxy +k8s.io/apimachinery/pkg/runtime/serializer/cbor/direct +sigs.k8s.io/structured-merge-diff/value +sigs.k8s.io/structured-merge-diff/fieldpath k8s.io/utils/internal/third_party/forked/golang/net -crypto/x509 -net/textproto golang.org/x/net/internal/socks github.com/mailru/easyjson/buffer -github.com/google/uuid +crypto/x509 github.com/spf13/pflag +vendor/golang.org/x/net/http/httpproxy +github.com/google/uuid +net/textproto k8s.io/utils/net -sigs.k8s.io/structured-merge-diff/fieldpath github.com/mailru/easyjson/jwriter golang.org/x/net/proxy k8s.io/apimachinery/pkg/util/uuid +k8s.io/apimachinery/pkg/util/validation vendor/golang.org/x/net/http/httpguts -mime/multipart golang.org/x/net/http/httpguts -k8s.io/apimachinery/pkg/util/validation +mime/multipart +k8s.io/apimachinery/pkg/runtime/schema +k8s.io/apimachinery/pkg/util/intstr +k8s.io/apimachinery/pkg/api/resource k8s.io/apimachinery/pkg/labels sigs.k8s.io/structured-merge-diff/typed -crypto/tls sigs.k8s.io/structured-merge-diff/merge +crypto/tls google.golang.org/protobuf/internal/filetype google.golang.org/protobuf/runtime/protoimpl google.golang.org/protobuf/types/known/anypb @@ -1106,15 +1142,15 @@ github.com/golang/protobuf/proto net/http/httptrace net/http -k8s.io/apimachinery/pkg/util/runtime k8s.io/apimachinery/pkg/util/httpstream github.com/moby/spdystream/spdy -golang.org/x/net/http2 -net/http/httputil -golang.org/x/net/websocket +github.com/go-openapi/swag github.com/google/gnostic-models/compiler net/rpc -github.com/go-openapi/swag +net/http/httputil +golang.org/x/net/http2 +k8s.io/apimachinery/pkg/util/runtime +golang.org/x/net/websocket k8s.io/apimachinery/pkg/util/wait k8s.io/apimachinery/pkg/runtime github.com/moby/spdystream @@ -1122,60 +1158,60 @@ github.com/google/gnostic-models/openapiv3 github.com/onsi/ginkgo/v2/internal/parallel_support github.com/go-openapi/jsonpointer -github.com/go-openapi/jsonreference -k8s.io/kube-openapi/pkg/internal github.com/onsi/ginkgo/v2/internal/interrupt_handler github.com/onsi/ginkgo/v2/internal +github.com/go-openapi/jsonreference +k8s.io/kube-openapi/pkg/internal k8s.io/apimachinery/pkg/runtime/serializer/recognizer -k8s.io/apimachinery/pkg/api/apitesting/naming +k8s.io/apimachinery/pkg/runtime/testing k8s.io/apimachinery/pkg/runtime/serializer/streaming +k8s.io/apimachinery/pkg/api/apitesting/naming k8s.io/apimachinery/pkg/runtime/serializer/yaml -k8s.io/apimachinery/pkg/runtime/testing k8s.io/apimachinery/pkg/runtime/serializer/json k8s.io/apimachinery/pkg/util/net github.com/onsi/ginkgo/v2/internal/global github.com/onsi/ginkgo/v2/internal/testingtproxy -github.com/onsi/ginkgo/v2 k8s.io/apimachinery/pkg/watch +github.com/onsi/ginkgo/v2 k8s.io/apimachinery/pkg/apis/meta/v1 k8s.io/apimachinery/pkg/util/net/testing -k8s.io/kube-openapi/pkg/util/proto k8s.io/kube-openapi/pkg/validation/spec +k8s.io/kube-openapi/pkg/util/proto k8s.io/kube-openapi/pkg/schemaconv k8s.io/kube-openapi/pkg/spec3 -k8s.io/apimachinery/pkg/util/strategicpatch/testing k8s.io/apimachinery/pkg/runtime/serializer/protobuf -k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/apis/meta/v1/unstructured +k8s.io/apimachinery/pkg/api/equality +k8s.io/apimachinery/pkg/api/meta k8s.io/apimachinery/pkg/apis/meta/v1beta1 k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/apis/meta/v1/validation k8s.io/apimachinery/pkg/apis/meta/v1beta1/validation -k8s.io/apimachinery/pkg/util/remotecommand k8s.io/apimachinery/pkg/apis/testapigroup -k8s.io/apimachinery/pkg/api/meta +k8s.io/apimachinery/pkg/util/remotecommand k8s.io/apimachinery/pkg/util/httpstream/wsstream -k8s.io/apimachinery/pkg/util/proxy k8s.io/apimachinery/pkg/apis/testapigroup/v1 k8s.io/apimachinery/pkg/apis/meta/internalversion +k8s.io/apimachinery/pkg/util/proxy k8s.io/apimachinery/pkg/runtime/serializer/versioning k8s.io/apimachinery/pkg/runtime/serializer/cbor k8s.io/apimachinery/pkg/util/strategicpatch k8s.io/apimachinery/pkg/apis/meta/internalversion/validation -k8s.io/apimachinery/pkg/runtime/serializer -k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructuredscheme k8s.io/apimachinery/pkg/api/meta/table k8s.io/apimachinery/pkg/api/meta/testrestmapper k8s.io/apimachinery/pkg/api/validation -k8s.io/apimachinery/pkg/api/apitesting -k8s.io/apimachinery/pkg/api/apitesting/fuzzer +k8s.io/apimachinery/pkg/util/strategicpatch/testing +k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructuredscheme +k8s.io/apimachinery/pkg/runtime/serializer +k8s.io/apimachinery/pkg/apis/testapigroup/install +k8s.io/apimachinery/pkg/util/managedfields/internal k8s.io/apimachinery/pkg/apis/meta/internalversion/scheme k8s.io/apimachinery/pkg/util/httpstream/spdy -k8s.io/apimachinery/pkg/apis/testapigroup/install +k8s.io/apimachinery/pkg/api/apitesting/fuzzer +k8s.io/apimachinery/pkg/api/apitesting k8s.io/apimachinery/pkg/test k8s.io/apimachinery/pkg/apis/meta/fuzzer k8s.io/apimachinery/pkg/apis/testapigroup/fuzzer -k8s.io/apimachinery/pkg/util/managedfields/internal k8s.io/apimachinery/pkg/api/apitesting/roundtrip k8s.io/apimachinery/pkg/util/managedfields k8s.io/apimachinery/pkg/util/managedfields/internal/testing @@ -1187,13 +1223,13 @@ find _build/src/k8s.io/apimachinery/pkg/util/managedfields -name "*_test.go" -delete make[1]: Leaving directory '/build/reproducible-path/golang-k8s-apimachinery-0.31.4' dh_auto_test -O--builddirectory=_build -O--buildsystem=golang - cd _build && go test -vet=off -v -p 20 k8s.io/apimachinery k8s.io/apimachinery/pkg/api/apitesting k8s.io/apimachinery/pkg/api/apitesting/fuzzer k8s.io/apimachinery/pkg/api/apitesting/naming k8s.io/apimachinery/pkg/api/apitesting/roundtrip k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/api/meta k8s.io/apimachinery/pkg/api/meta/table k8s.io/apimachinery/pkg/api/meta/testrestmapper k8s.io/apimachinery/pkg/api/resource k8s.io/apimachinery/pkg/api/validation k8s.io/apimachinery/pkg/api/validation/path k8s.io/apimachinery/pkg/apis/meta/fuzzer k8s.io/apimachinery/pkg/apis/meta/internalversion k8s.io/apimachinery/pkg/apis/meta/internalversion/scheme k8s.io/apimachinery/pkg/apis/meta/internalversion/validation k8s.io/apimachinery/pkg/apis/meta/v1 k8s.io/apimachinery/pkg/apis/meta/v1/unstructured k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructuredscheme k8s.io/apimachinery/pkg/apis/meta/v1/validation k8s.io/apimachinery/pkg/apis/meta/v1beta1 k8s.io/apimachinery/pkg/apis/meta/v1beta1/validation k8s.io/apimachinery/pkg/apis/testapigroup k8s.io/apimachinery/pkg/apis/testapigroup/fuzzer k8s.io/apimachinery/pkg/apis/testapigroup/install k8s.io/apimachinery/pkg/apis/testapigroup/v1 k8s.io/apimachinery/pkg/conversion k8s.io/apimachinery/pkg/conversion/queryparams k8s.io/apimachinery/pkg/fields k8s.io/apimachinery/pkg/labels k8s.io/apimachinery/pkg/runtime k8s.io/apimachinery/pkg/runtime/schema k8s.io/apimachinery/pkg/runtime/serializer k8s.io/apimachinery/pkg/runtime/serializer/cbor k8s.io/apimachinery/pkg/runtime/serializer/cbor/direct k8s.io/apimachinery/pkg/runtime/serializer/cbor/internal/modes k8s.io/apimachinery/pkg/runtime/serializer/json k8s.io/apimachinery/pkg/runtime/serializer/protobuf k8s.io/apimachinery/pkg/runtime/serializer/recognizer k8s.io/apimachinery/pkg/runtime/serializer/recognizer/testing k8s.io/apimachinery/pkg/runtime/serializer/streaming k8s.io/apimachinery/pkg/runtime/serializer/versioning k8s.io/apimachinery/pkg/runtime/serializer/yaml k8s.io/apimachinery/pkg/runtime/testing k8s.io/apimachinery/pkg/selection k8s.io/apimachinery/pkg/test k8s.io/apimachinery/pkg/types k8s.io/apimachinery/pkg/util/cache k8s.io/apimachinery/pkg/util/diff k8s.io/apimachinery/pkg/util/dump k8s.io/apimachinery/pkg/util/duration k8s.io/apimachinery/pkg/util/errors k8s.io/apimachinery/pkg/util/framer k8s.io/apimachinery/pkg/util/httpstream k8s.io/apimachinery/pkg/util/httpstream/spdy k8s.io/apimachinery/pkg/util/httpstream/wsstream k8s.io/apimachinery/pkg/util/intstr k8s.io/apimachinery/pkg/util/json k8s.io/apimachinery/pkg/util/jsonmergepatch k8s.io/apimachinery/pkg/util/managedfields k8s.io/apimachinery/pkg/util/managedfields/internal k8s.io/apimachinery/pkg/util/managedfields/internal/testing k8s.io/apimachinery/pkg/util/managedfields/managedfieldstest k8s.io/apimachinery/pkg/util/mergepatch k8s.io/apimachinery/pkg/util/naming k8s.io/apimachinery/pkg/util/net k8s.io/apimachinery/pkg/util/net/testing k8s.io/apimachinery/pkg/util/portforward k8s.io/apimachinery/pkg/util/proxy k8s.io/apimachinery/pkg/util/rand k8s.io/apimachinery/pkg/util/remotecommand k8s.io/apimachinery/pkg/util/runtime k8s.io/apimachinery/pkg/util/sets k8s.io/apimachinery/pkg/util/strategicpatch k8s.io/apimachinery/pkg/util/strategicpatch/testing k8s.io/apimachinery/pkg/util/uuid k8s.io/apimachinery/pkg/util/validation k8s.io/apimachinery/pkg/util/validation/field k8s.io/apimachinery/pkg/util/version k8s.io/apimachinery/pkg/util/wait k8s.io/apimachinery/pkg/util/waitgroup k8s.io/apimachinery/pkg/util/yaml k8s.io/apimachinery/pkg/version k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect + cd _build && go test -vet=off -v -p 42 k8s.io/apimachinery k8s.io/apimachinery/pkg/api/apitesting k8s.io/apimachinery/pkg/api/apitesting/fuzzer k8s.io/apimachinery/pkg/api/apitesting/naming k8s.io/apimachinery/pkg/api/apitesting/roundtrip k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/api/meta k8s.io/apimachinery/pkg/api/meta/table k8s.io/apimachinery/pkg/api/meta/testrestmapper k8s.io/apimachinery/pkg/api/resource k8s.io/apimachinery/pkg/api/validation k8s.io/apimachinery/pkg/api/validation/path k8s.io/apimachinery/pkg/apis/meta/fuzzer k8s.io/apimachinery/pkg/apis/meta/internalversion k8s.io/apimachinery/pkg/apis/meta/internalversion/scheme k8s.io/apimachinery/pkg/apis/meta/internalversion/validation k8s.io/apimachinery/pkg/apis/meta/v1 k8s.io/apimachinery/pkg/apis/meta/v1/unstructured k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructuredscheme k8s.io/apimachinery/pkg/apis/meta/v1/validation k8s.io/apimachinery/pkg/apis/meta/v1beta1 k8s.io/apimachinery/pkg/apis/meta/v1beta1/validation k8s.io/apimachinery/pkg/apis/testapigroup k8s.io/apimachinery/pkg/apis/testapigroup/fuzzer k8s.io/apimachinery/pkg/apis/testapigroup/install k8s.io/apimachinery/pkg/apis/testapigroup/v1 k8s.io/apimachinery/pkg/conversion k8s.io/apimachinery/pkg/conversion/queryparams k8s.io/apimachinery/pkg/fields k8s.io/apimachinery/pkg/labels k8s.io/apimachinery/pkg/runtime k8s.io/apimachinery/pkg/runtime/schema k8s.io/apimachinery/pkg/runtime/serializer k8s.io/apimachinery/pkg/runtime/serializer/cbor k8s.io/apimachinery/pkg/runtime/serializer/cbor/direct k8s.io/apimachinery/pkg/runtime/serializer/cbor/internal/modes k8s.io/apimachinery/pkg/runtime/serializer/json k8s.io/apimachinery/pkg/runtime/serializer/protobuf k8s.io/apimachinery/pkg/runtime/serializer/recognizer k8s.io/apimachinery/pkg/runtime/serializer/recognizer/testing k8s.io/apimachinery/pkg/runtime/serializer/streaming k8s.io/apimachinery/pkg/runtime/serializer/versioning k8s.io/apimachinery/pkg/runtime/serializer/yaml k8s.io/apimachinery/pkg/runtime/testing k8s.io/apimachinery/pkg/selection k8s.io/apimachinery/pkg/test k8s.io/apimachinery/pkg/types k8s.io/apimachinery/pkg/util/cache k8s.io/apimachinery/pkg/util/diff k8s.io/apimachinery/pkg/util/dump k8s.io/apimachinery/pkg/util/duration k8s.io/apimachinery/pkg/util/errors k8s.io/apimachinery/pkg/util/framer k8s.io/apimachinery/pkg/util/httpstream k8s.io/apimachinery/pkg/util/httpstream/spdy k8s.io/apimachinery/pkg/util/httpstream/wsstream k8s.io/apimachinery/pkg/util/intstr k8s.io/apimachinery/pkg/util/json k8s.io/apimachinery/pkg/util/jsonmergepatch k8s.io/apimachinery/pkg/util/managedfields k8s.io/apimachinery/pkg/util/managedfields/internal k8s.io/apimachinery/pkg/util/managedfields/internal/testing k8s.io/apimachinery/pkg/util/managedfields/managedfieldstest k8s.io/apimachinery/pkg/util/mergepatch k8s.io/apimachinery/pkg/util/naming k8s.io/apimachinery/pkg/util/net k8s.io/apimachinery/pkg/util/net/testing k8s.io/apimachinery/pkg/util/portforward k8s.io/apimachinery/pkg/util/proxy k8s.io/apimachinery/pkg/util/rand k8s.io/apimachinery/pkg/util/remotecommand k8s.io/apimachinery/pkg/util/runtime k8s.io/apimachinery/pkg/util/sets k8s.io/apimachinery/pkg/util/strategicpatch k8s.io/apimachinery/pkg/util/strategicpatch/testing k8s.io/apimachinery/pkg/util/uuid k8s.io/apimachinery/pkg/util/validation k8s.io/apimachinery/pkg/util/validation/field k8s.io/apimachinery/pkg/util/version k8s.io/apimachinery/pkg/util/wait k8s.io/apimachinery/pkg/util/waitgroup k8s.io/apimachinery/pkg/util/yaml k8s.io/apimachinery/pkg/version k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect ? k8s.io/apimachinery [no test files] ? k8s.io/apimachinery/pkg/api/apitesting [no test files] === RUN TestValueFuzz --- PASS: TestValueFuzz (0.00s) PASS -ok k8s.io/apimachinery/pkg/api/apitesting/fuzzer 0.076s +ok k8s.io/apimachinery/pkg/api/apitesting/fuzzer 0.012s ? k8s.io/apimachinery/pkg/api/apitesting/naming [no test files] ? k8s.io/apimachinery/pkg/api/apitesting/roundtrip [no test files] ? k8s.io/apimachinery/pkg/api/equality [no test files] @@ -1290,7 +1326,7 @@ === RUN TestStatusCauseSupportsWrappedErrors --- PASS: TestStatusCauseSupportsWrappedErrors (0.00s) PASS -ok k8s.io/apimachinery/pkg/api/errors 0.055s +ok k8s.io/apimachinery/pkg/api/errors 0.026s === RUN TestSetStatusCondition === RUN TestSetStatusCondition/should-add === RUN TestSetStatusCondition/use-supplied-time @@ -1346,18 +1382,18 @@ === RUN TestEachList/UnstructuredList === RUN TestEachList/UnstructuredList/EachListItem === RUN TestEachList/UnstructuredList/EachListItemWithAlloc ---- PASS: TestEachList (0.11s) - --- PASS: TestEachList/StructReceiverList (0.02s) +--- PASS: TestEachList (0.04s) + --- PASS: TestEachList/StructReceiverList (0.01s) --- PASS: TestEachList/StructReceiverList/EachListItem (0.00s) --- PASS: TestEachList/StructReceiverList/EachListItemWithAlloc (0.01s) - --- PASS: TestEachList/PointerReceiverList (0.05s) - --- PASS: TestEachList/PointerReceiverList/EachListItem (0.02s) - --- PASS: TestEachList/PointerReceiverList/EachListItemWithAlloc (0.02s) + --- PASS: TestEachList/PointerReceiverList (0.01s) + --- PASS: TestEachList/PointerReceiverList/EachListItem (0.01s) + --- PASS: TestEachList/PointerReceiverList/EachListItemWithAlloc (0.00s) --- PASS: TestEachList/RawExtensionList (0.01s) --- PASS: TestEachList/RawExtensionList/EachListItem (0.00s) - --- PASS: TestEachList/RawExtensionList/EachListItemWithAlloc (0.01s) - --- PASS: TestEachList/UnstructuredList (0.03s) - --- PASS: TestEachList/UnstructuredList/EachListItem (0.02s) + --- PASS: TestEachList/RawExtensionList/EachListItemWithAlloc (0.00s) + --- PASS: TestEachList/UnstructuredList (0.02s) + --- PASS: TestEachList/UnstructuredList/EachListItem (0.01s) --- PASS: TestEachList/UnstructuredList/EachListItemWithAlloc (0.01s) === RUN TestExtractList === RUN TestExtractList/StructReceiverList @@ -1372,21 +1408,21 @@ === RUN TestExtractList/UnstructuredList === RUN TestExtractList/UnstructuredList/ExtractList === RUN TestExtractList/UnstructuredList/ExtractListWithAlloc ---- PASS: TestExtractList (0.15s) - --- PASS: TestExtractList/StructReceiverList (0.04s) - --- PASS: TestExtractList/StructReceiverList/ExtractList (0.02s) - --- PASS: TestExtractList/StructReceiverList/ExtractListWithAlloc (0.01s) - --- PASS: TestExtractList/PointerReceiverList (0.03s) - --- PASS: TestExtractList/PointerReceiverList/ExtractList (0.00s) - --- PASS: TestExtractList/PointerReceiverList/ExtractListWithAlloc (0.03s) - --- PASS: TestExtractList/RawExtensionList (0.03s) - --- PASS: TestExtractList/RawExtensionList/ExtractList (0.01s) - --- PASS: TestExtractList/RawExtensionList/ExtractListWithAlloc (0.01s) - --- PASS: TestExtractList/UnstructuredList (0.04s) - --- PASS: TestExtractList/UnstructuredList/ExtractList (0.00s) - --- PASS: TestExtractList/UnstructuredList/ExtractListWithAlloc (0.03s) +--- PASS: TestExtractList (0.05s) + --- PASS: TestExtractList/StructReceiverList (0.01s) + --- PASS: TestExtractList/StructReceiverList/ExtractList (0.01s) + --- PASS: TestExtractList/StructReceiverList/ExtractListWithAlloc (0.00s) + --- PASS: TestExtractList/PointerReceiverList (0.01s) + --- PASS: TestExtractList/PointerReceiverList/ExtractList (0.01s) + --- PASS: TestExtractList/PointerReceiverList/ExtractListWithAlloc (0.00s) + --- PASS: TestExtractList/RawExtensionList (0.01s) + --- PASS: TestExtractList/RawExtensionList/ExtractList (0.00s) + --- PASS: TestExtractList/RawExtensionList/ExtractListWithAlloc (0.00s) + --- PASS: TestExtractList/UnstructuredList (0.02s) + --- PASS: TestExtractList/UnstructuredList/ExtractList (0.02s) + --- PASS: TestExtractList/UnstructuredList/ExtractListWithAlloc (0.00s) === RUN TestAsPartialObjectMetadata ---- PASS: TestAsPartialObjectMetadata (0.02s) +--- PASS: TestAsPartialObjectMetadata (0.01s) === RUN TestMultiRESTMapperResourceFor --- PASS: TestMultiRESTMapperResourceFor (0.00s) === RUN TestMultiRESTMapperResourcesFor @@ -1426,7 +1462,7 @@ === RUN TestRESTMapperReportsErrorOnBadVersion --- PASS: TestRESTMapperReportsErrorOnBadVersion (0.00s) PASS -ok k8s.io/apimachinery/pkg/api/meta 0.457s +ok k8s.io/apimachinery/pkg/api/meta 0.136s ? k8s.io/apimachinery/pkg/api/meta/table [no test files] ? k8s.io/apimachinery/pkg/api/meta/testrestmapper [no test files] === RUN TestInt64AmountAsInt64 @@ -1528,7 +1564,7 @@ === RUN TestMul --- PASS: TestMul (0.00s) === RUN TestAddSubRoundTrip ---- PASS: TestAddSubRoundTrip (0.01s) +--- PASS: TestAddSubRoundTrip (0.00s) === RUN TestAddSubRoundTripAcrossScales --- PASS: TestAddSubRoundTripAcrossScales (0.00s) === RUN TestNegateRoundTrip @@ -1634,7 +1670,7 @@ --- PASS: TestQuantityUnmarshalCBOR/empty_text_string (0.00s) --- PASS: TestQuantityUnmarshalCBOR/unsupported_input_type (0.00s) === RUN TestQuantityRoundtripCBOR ---- PASS: TestQuantityRoundtripCBOR (0.01s) +--- PASS: TestQuantityRoundtripCBOR (0.00s) === RUN TestScaledValueInternal --- PASS: TestScaledValueInternal (0.00s) === RUN ExampleQuantityValue @@ -1644,7 +1680,7 @@ === RUN ExampleMustParse --- PASS: ExampleMustParse (0.00s) PASS -ok k8s.io/apimachinery/pkg/api/resource 0.264s +ok k8s.io/apimachinery/pkg/api/resource 0.039s === RUN TestMaskTrailingDash --- PASS: TestMaskTrailingDash (0.00s) === RUN TestValidateObjectMetaCustomName @@ -1668,13 +1704,13 @@ === RUN TestValidateAnnotations --- PASS: TestValidateAnnotations (0.00s) PASS -ok k8s.io/apimachinery/pkg/api/validation 0.072s +ok k8s.io/apimachinery/pkg/api/validation 0.035s === RUN TestValidatePathSegmentName --- PASS: TestValidatePathSegmentName (0.00s) === RUN TestValidateWithMultiErrors --- PASS: TestValidateWithMultiErrors (0.00s) PASS -ok k8s.io/apimachinery/pkg/api/validation/path 0.044s +ok k8s.io/apimachinery/pkg/api/validation/path 0.011s ? k8s.io/apimachinery/pkg/apis/meta/fuzzer [no test files] === RUN TestSetListOptionsDefaults === RUN TestSetListOptionsDefaults/no-op,_RV_doesn't_match @@ -1699,13 +1735,53 @@ --- PASS: TestSetListOptionsDefaults/no-op,_match_on_empty_RV_but_SendInitialEvents_is_off (0.00s) --- PASS: TestSetListOptionsDefaults/no-op,_match_on_empty_RV_but_ResourceVersionMatch_set (0.00s) PASS -ok k8s.io/apimachinery/pkg/apis/meta/internalversion 0.052s +ok k8s.io/apimachinery/pkg/apis/meta/internalversion 0.033s === RUN TestListOptions --- PASS: TestListOptions (0.00s) === RUN TestRoundTrip roundtrip.go:135: starting group "" roundtrip.go:148: finished group "" roundtrip.go:135: starting group "meta.k8s.io" + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=CreateOptions v1.CreateOptions roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=CreateOptions v1.CreateOptions roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=CreateOptions v1.CreateOptions @@ -1746,62 +1822,21 @@ roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=UpdateOptions v1.UpdateOptions roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=UpdateOptions v1.UpdateOptions roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=UpdateOptions v1.UpdateOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table @@ -1811,6 +1846,7 @@ roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table @@ -1818,69 +1854,27 @@ roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList @@ -1888,28 +1882,70 @@ roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata roundtrip.go:148: finished group "meta.k8s.io" ---- PASS: TestRoundTrip (0.12s) +--- PASS: TestRoundTrip (0.10s) PASS -ok k8s.io/apimachinery/pkg/apis/meta/internalversion/scheme 0.256s +ok k8s.io/apimachinery/pkg/apis/meta/internalversion/scheme 0.129s === RUN TestValidateListOptions === RUN TestValidateListOptions/valid-default === RUN TestValidateListOptions/valid-resourceversionmatch-exact @@ -1929,7 +1965,7 @@ === RUN TestValidateListOptions/watch-sendInitialEvents-no-allowWatchBookmark === RUN TestValidateListOptions/watch-sendInitialEvents-no-watchlist-fg-disabled === RUN TestValidateListOptions/watch-sendInitialEvents-no-watchlist-fg-disabled#01 ---- PASS: TestValidateListOptions (0.00s) +--- PASS: TestValidateListOptions (0.01s) --- PASS: TestValidateListOptions/valid-default (0.00s) --- PASS: TestValidateListOptions/valid-resourceversionmatch-exact (0.00s) --- PASS: TestValidateListOptions/invalid-resourceversionmatch-exact (0.00s) @@ -1949,7 +1985,7 @@ --- PASS: TestValidateListOptions/watch-sendInitialEvents-no-watchlist-fg-disabled (0.00s) --- PASS: TestValidateListOptions/watch-sendInitialEvents-no-watchlist-fg-disabled#01 (0.00s) PASS -ok k8s.io/apimachinery/pkg/apis/meta/internalversion/validation 0.051s +ok k8s.io/apimachinery/pkg/apis/meta/internalversion/validation 0.031s === RUN TestNewControllerRef --- PASS: TestNewControllerRef (0.00s) === RUN TestGetControllerOf @@ -3127,7 +3163,7 @@ === RUN TestPatchOptionsIsSuperSetOfUpdateOptions/Run_997/1000 === RUN TestPatchOptionsIsSuperSetOfUpdateOptions/Run_998/1000 === RUN TestPatchOptionsIsSuperSetOfUpdateOptions/Run_999/1000 ---- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions (0.20s) +--- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions (0.24s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_0/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_1/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_2/1000 (0.00s) @@ -3436,7 +3472,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_305/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_306/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_307/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_308/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_308/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_309/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_310/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_311/1000 (0.00s) @@ -3475,7 +3511,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_344/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_345/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_346/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_347/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_347/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_348/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_349/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_350/1000 (0.00s) @@ -3871,7 +3907,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_740/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_741/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_742/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_743/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_743/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_744/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_745/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_746/1000 (0.00s) @@ -3934,10 +3970,10 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_803/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_804/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_805/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_806/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_806/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_807/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_808/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_809/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_809/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_810/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_811/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_812/1000 (0.00s) @@ -4209,7 +4245,7 @@ === RUN TestConvertSliceStringToPointerTime --- PASS: TestConvertSliceStringToPointerTime (0.00s) PASS -ok k8s.io/apimachinery/pkg/apis/meta/v1 0.270s +ok k8s.io/apimachinery/pkg/apis/meta/v1 0.290s === RUN TestCodecOfUnstructuredList --- PASS: TestCodecOfUnstructuredList (0.00s) === RUN TestRemoveNestedField @@ -4291,11 +4327,11 @@ === RUN TestNilUnstructuredContent --- PASS: TestNilUnstructuredContent (0.00s) === RUN TestUnstructuredMetadataRoundTrip ---- PASS: TestUnstructuredMetadataRoundTrip (0.25s) +--- PASS: TestUnstructuredMetadataRoundTrip (0.17s) === RUN TestUnstructuredMetadataOmitempty --- PASS: TestUnstructuredMetadataOmitempty (0.00s) PASS -ok k8s.io/apimachinery/pkg/apis/meta/v1/unstructured 0.301s +ok k8s.io/apimachinery/pkg/apis/meta/v1/unstructured 0.208s ? k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructuredscheme [no test files] === RUN TestValidateLabels --- PASS: TestValidateLabels (0.00s) @@ -4314,23 +4350,23 @@ --- PASS: TestInvalidDryRun/[False] (0.00s) --- PASS: TestInvalidDryRun/[All_False] (0.00s) === RUN TestValidPatchOptions -=== RUN TestValidPatchOptions/{{_}_[]_0xc0002384c8_kubectl_} +=== RUN TestValidPatchOptions/{{_}_[]_0xc0001f45d8_kubectl_} === RUN TestValidPatchOptions/{{_}_[]__kubectl_} === RUN TestValidPatchOptions/{{_}_[]___} === RUN TestValidPatchOptions/{{_}_[]__patcher_} ---- PASS: TestValidPatchOptions (0.00s) - --- PASS: TestValidPatchOptions/{{_}_[]_0xc0002384c8_kubectl_} (0.00s) +--- PASS: TestValidPatchOptions (0.01s) + --- PASS: TestValidPatchOptions/{{_}_[]_0xc0001f45d8_kubectl_} (0.00s) --- PASS: TestValidPatchOptions/{{_}_[]__kubectl_} (0.00s) --- PASS: TestValidPatchOptions/{{_}_[]___} (0.00s) --- PASS: TestValidPatchOptions/{{_}_[]__patcher_} (0.00s) === RUN TestInvalidPatchOptions === RUN TestInvalidPatchOptions/{{_}_[]___} -=== RUN TestInvalidPatchOptions/{{_}_[]_0xc0002385d0__} -=== RUN TestInvalidPatchOptions/{{_}_[]_0xc0002385d1_kubectl_} +=== RUN TestInvalidPatchOptions/{{_}_[]_0xc0001f46e0__} +=== RUN TestInvalidPatchOptions/{{_}_[]_0xc0001f46e1_kubectl_} --- PASS: TestInvalidPatchOptions (0.00s) --- PASS: TestInvalidPatchOptions/{{_}_[]___} (0.00s) - --- PASS: TestInvalidPatchOptions/{{_}_[]_0xc0002385d0__} (0.00s) - --- PASS: TestInvalidPatchOptions/{{_}_[]_0xc0002385d1_kubectl_} (0.00s) + --- PASS: TestInvalidPatchOptions/{{_}_[]_0xc0001f46e0__} (0.00s) + --- PASS: TestInvalidPatchOptions/{{_}_[]_0xc0001f46e1_kubectl_} (0.00s) === RUN TestValidateFieldManagerValid === RUN TestValidateFieldManagerValid/filedManager === RUN TestValidateFieldManagerValid/你好 @@ -4390,7 +4426,7 @@ --- PASS: TestLabelSelectorMatchExpression/MatchExpression's_operator_isn't_valid (0.00s) --- PASS: TestLabelSelectorMatchExpression/MatchExpression's_value_name_isn't_valid (0.00s) PASS -ok k8s.io/apimachinery/pkg/apis/meta/v1/validation 0.072s +ok k8s.io/apimachinery/pkg/apis/meta/v1/validation 0.052s ? k8s.io/apimachinery/pkg/apis/meta/v1beta1 [no test files] ? k8s.io/apimachinery/pkg/apis/meta/v1beta1/validation [no test files] ? k8s.io/apimachinery/pkg/apis/testapigroup [no test files] @@ -4444,9 +4480,9 @@ roundtrip.go:254: round tripping to testapigroup.apimachinery.k8s.io/v1, Kind=Carp v1.Carp roundtrip.go:254: round tripping to testapigroup.apimachinery.k8s.io/v1, Kind=Carp v1.Carp roundtrip.go:148: finished group "testapigroup.apimachinery.k8s.io" ---- PASS: TestRoundTrip (0.09s) +--- PASS: TestRoundTrip (0.04s) PASS -ok k8s.io/apimachinery/pkg/apis/testapigroup/install 0.158s +ok k8s.io/apimachinery/pkg/apis/testapigroup/install 0.058s ? k8s.io/apimachinery/pkg/apis/testapigroup/v1 [no test files] === RUN TestConverter_byteSlice --- PASS: TestConverter_byteSlice (0.00s) @@ -4467,11 +4503,11 @@ === RUN TestEnforceNilPtr --- PASS: TestEnforceNilPtr (0.00s) PASS -ok k8s.io/apimachinery/pkg/conversion 0.049s +ok k8s.io/apimachinery/pkg/conversion 0.013s === RUN TestConvert --- PASS: TestConvert (0.00s) PASS -ok k8s.io/apimachinery/pkg/conversion/queryparams 0.048s +ok k8s.io/apimachinery/pkg/conversion/queryparams 0.026s === RUN TestSetString --- PASS: TestSetString (0.00s) === RUN TestFieldHas @@ -4505,7 +4541,7 @@ === RUN TestTransform --- PASS: TestTransform (0.00s) PASS -ok k8s.io/apimachinery/pkg/fields 0.032s +ok k8s.io/apimachinery/pkg/fields 0.017s === RUN TestSetString --- PASS: TestSetString (0.00s) === RUN TestLabelHas @@ -4547,7 +4583,7 @@ === RUN TestRequirementSelectorMatching --- PASS: TestRequirementSelectorMatching (0.00s) === RUN TestSetSelectorParser ---- PASS: TestSetSelectorParser (0.00s) +--- PASS: TestSetSelectorParser (0.01s) === RUN TestAdd --- PASS: TestAdd (0.00s) === RUN TestSafeSort @@ -4576,7 +4612,7 @@ === RUN TestRequiresExactMatch/keyDoubleEqualOperatorExactMatch === RUN TestRequiresExactMatch/keyNotEqualOperatorExactMatch === RUN TestRequiresExactMatch/keyEqualOperatorExactMatchFirst ---- PASS: TestRequiresExactMatch (0.01s) +--- PASS: TestRequiresExactMatch (0.00s) --- PASS: TestRequiresExactMatch/keyInOperatorExactMatch (0.00s) --- PASS: TestRequiresExactMatch/keyInOperatorNotExactMatch (0.00s) --- PASS: TestRequiresExactMatch/keyInOperatorNotExactMatch#01 (0.00s) @@ -4597,9 +4633,9 @@ --- PASS: TestRequirementEqual/requirements_with_different_operators_should_not_be_equal (0.00s) --- PASS: TestRequirementEqual/requirements_with_different_values_should_not_be_equal (0.00s) PASS -ok k8s.io/apimachinery/pkg/labels 0.070s +ok k8s.io/apimachinery/pkg/labels 0.033s === RUN TestAllocatorRandomInputs ---- PASS: TestAllocatorRandomInputs (0.08s) +--- PASS: TestAllocatorRandomInputs (0.03s) === RUN TestAllocatorNeverShrinks --- PASS: TestAllocatorNeverShrinks (0.00s) === RUN TestAllocatorZero @@ -4617,10 +4653,10 @@ === RUN TestResourceMapper/empty_identityfunc === RUN TestResourceMapper/common_identityfunc === RUN TestResourceMapper/colocated_deployments ---- PASS: TestResourceMapper (0.01s) +--- PASS: TestResourceMapper (0.00s) --- PASS: TestResourceMapper/no_identityfunc (0.00s) --- PASS: TestResourceMapper/empty_identityfunc (0.00s) - --- PASS: TestResourceMapper/common_identityfunc (0.01s) + --- PASS: TestResourceMapper/common_identityfunc (0.00s) --- PASS: TestResourceMapper/colocated_deployments (0.00s) === RUN TestFmtRawDoc --- PASS: TestFmtRawDoc (0.00s) @@ -4678,7 +4714,7 @@ --- PASS: TestUnknownFields/3 (0.00s) --- PASS: TestUnknownFields/4 (0.00s) --- PASS: TestUnknownFields/5 (0.00s) - --- PASS: TestUnknownFields/6 (0.01s) + --- PASS: TestUnknownFields/6 (0.00s) --- PASS: TestUnknownFields/7 (0.00s) === RUN TestUnrecognized === RUN TestUnrecognized/{"da":[3.5,4,"3.0",null]} @@ -4715,7 +4751,7 @@ === RUN TestUnrecognized/{"fi":"abc"} === RUN TestUnrecognized/{"fi":["abc"]} === RUN TestUnrecognized/{"fi":[true]} ---- PASS: TestUnrecognized (0.01s) +--- PASS: TestUnrecognized (0.00s) --- PASS: TestUnrecognized/{"da":[3.5,4,"3.0",null]} (0.00s) --- PASS: TestUnrecognized/{"ea":[3.5,4,"3.0",null]} (0.00s) --- PASS: TestUnrecognized/{"ea":[null,null,null]} (0.00s) @@ -4778,22 +4814,22 @@ === CONT TestCustomToUnstructured/null === CONT TestCustomToUnstructured/0.0 === CONT TestCustomToUnstructured/0 -=== CONT TestCustomToUnstructured/[1] === CONT TestCustomToUnstructured/{"a":1} === CONT TestCustomToUnstructured/{} -=== CONT TestCustomToUnstructured/false +=== CONT TestCustomToUnstructured/[1] === CONT TestCustomToUnstructured/[] +=== CONT TestCustomToUnstructured/false === CONT TestCustomToUnstructured/true --- PASS: TestCustomToUnstructured (0.00s) --- PASS: TestCustomToUnstructured/null (0.00s) --- PASS: TestCustomToUnstructured/0.0 (0.00s) - --- PASS: TestCustomToUnstructured/[1] (0.00s) + --- PASS: TestCustomToUnstructured/0 (0.00s) --- PASS: TestCustomToUnstructured/{"a":1} (0.00s) --- PASS: TestCustomToUnstructured/{} (0.00s) - --- PASS: TestCustomToUnstructured/false (0.00s) + --- PASS: TestCustomToUnstructured/[1] (0.00s) --- PASS: TestCustomToUnstructured/[] (0.00s) + --- PASS: TestCustomToUnstructured/false (0.00s) --- PASS: TestCustomToUnstructured/true (0.00s) - --- PASS: TestCustomToUnstructured/0 (0.00s) === RUN TestCustomToUnstructuredTopLevel === RUN TestCustomToUnstructuredTopLevel/0 === PAUSE TestCustomToUnstructuredTopLevel/0 @@ -4811,7 +4847,7 @@ {"apiVersion":"test.group/v1test","kind":"ObjectTest","items":[{"apiVersion":"test.group/v1test","kind":"EmbeddedTest","id":"foo","object":null,"emptyObject":null},{"apiVersion":"test.group/v1test","kind":"EmbeddedTest","id":"bar","object":null,"emptyObject":null},{"apiVersion":"unknown.group/unknown","foo":"bar","kind":"OtherTest"},{"apiVersion":"test.group/v1test","kind":"ObjectTest","items":[{"apiVersion":"test.group/v1test","kind":"EmbeddedTest","id":"baz","object":null,"emptyObject":null}]}]} embedded_test.go:111: exact wire is: {"apiVersion":"test.group/v1test","kind":"EmbeddedTest","id":"foo","object":null,"emptyObject":null} ---- PASS: TestArrayOfRuntimeObject (0.00s) +--- PASS: TestArrayOfRuntimeObject (0.01s) === RUN TestNestedObject embedded_test.go:171: Wire format is: {"apiVersion":"test.group/v1test","kind":"EmbeddedTest","id":"outer","object":{"apiVersion":"test.group/v1test","kind":"EmbeddedTest","id":"inner","object":null,"emptyObject":null},"emptyObject":null} @@ -4860,7 +4896,7 @@ === RUN TestRawExtensionMarshalUnstructured/invalid_json_with_json_prefix === RUN TestRawExtensionMarshalUnstructured/invalid_json_with_json_prefix/CBOR === RUN TestRawExtensionMarshalUnstructured/invalid_json_with_json_prefix/JSON ---- PASS: TestRawExtensionMarshalUnstructured (0.01s) +--- PASS: TestRawExtensionMarshalUnstructured (0.00s) --- PASS: TestRawExtensionMarshalUnstructured/nil_bytes_and_nil_object (0.00s) --- PASS: TestRawExtensionMarshalUnstructured/nil_bytes_and_nil_object/CBOR (0.00s) --- PASS: TestRawExtensionMarshalUnstructured/nil_bytes_and_nil_object/JSON (0.00s) @@ -4959,7 +4995,7 @@ === RUN TestConvertToVersion/18 === RUN TestConvertToVersion/19 === RUN TestConvertToVersion/20 ---- PASS: TestConvertToVersion (0.02s) +--- PASS: TestConvertToVersion (0.00s) --- PASS: TestConvertToVersion/0 (0.00s) --- PASS: TestConvertToVersion/1 (0.00s) --- PASS: TestConvertToVersion/2 (0.00s) @@ -4970,7 +5006,7 @@ --- PASS: TestConvertToVersion/7 (0.00s) --- PASS: TestConvertToVersion/8 (0.00s) --- PASS: TestConvertToVersion/9 (0.00s) - --- PASS: TestConvertToVersion/10 (0.01s) + --- PASS: TestConvertToVersion/10 (0.00s) --- PASS: TestConvertToVersion/11 (0.00s) --- PASS: TestConvertToVersion/12 (0.00s) --- PASS: TestConvertToVersion/13 (0.00s) @@ -5006,7 +5042,7 @@ --- PASS: TestSpliceBuffer/Write/Splice,_Reset,_Write/Splice (0.00s) --- PASS: TestSpliceBuffer/Write,_Reset,_Splice (0.00s) PASS -ok k8s.io/apimachinery/pkg/runtime 0.200s +ok k8s.io/apimachinery/pkg/runtime 0.127s === RUN TestGroupVersionParse --- PASS: TestGroupVersionParse (0.00s) === RUN TestGroupResourceParse @@ -5040,9 +5076,9 @@ === RUN TestBestMatch --- PASS: TestBestMatch (0.00s) PASS -ok k8s.io/apimachinery/pkg/runtime/schema 0.056s +ok k8s.io/apimachinery/pkg/runtime/schema 0.033s === RUN TestTypes ---- PASS: TestTypes (0.85s) +--- PASS: TestTypes (0.32s) === RUN TestVersionedEncoding --- PASS: TestVersionedEncoding (0.00s) === RUN TestMultipleNames @@ -5064,7 +5100,7 @@ --- PASS: TestSparse (0.00s) PASS -ok k8s.io/apimachinery/pkg/runtime/serializer 0.912s +ok k8s.io/apimachinery/pkg/runtime/serializer 0.385s === RUN TestRecognizesData === RUN TestRecognizesData/#00 === RUN TestRecognizesData/#01 @@ -5106,9 +5142,9 @@ === RUN TestDecode/no_strict_mode_no_strict_error === RUN TestDecode/unknown_error_from_typer_on_into === RUN TestDecode/missing_kind -E0301 23:23:13.898730 4111190 cbor.go:158] "Unhandled Error" err="EOF" logger="UnhandledError" +E0404 05:52:39.975478 833861 cbor.go:158] "Unhandled Error" err="EOF" logger="UnhandledError" === RUN TestDecode/missing_version -E0301 23:23:13.904425 4111190 cbor.go:158] "Unhandled Error" err="EOF" logger="UnhandledError" +E0404 05:52:39.976792 833861 cbor.go:158] "Unhandled Error" err="EOF" logger="UnhandledError" === RUN TestDecode/creater_error === RUN TestDecode/unmarshal_error === RUN TestDecode/strict_mode_unmarshal_error @@ -5136,7 +5172,7 @@ --- PASS: TestDecode/strict_mode_strict_error (0.00s) --- PASS: TestDecode/no_strict_mode_no_strict_error (0.00s) --- PASS: TestDecode/unknown_error_from_typer_on_into (0.00s) - --- PASS: TestDecode/missing_kind (0.01s) + --- PASS: TestDecode/missing_kind (0.00s) --- PASS: TestDecode/missing_version (0.00s) --- PASS: TestDecode/creater_error (0.00s) --- PASS: TestDecode/unmarshal_error (0.00s) @@ -5168,7 +5204,7 @@ === RUN TestTranscodeRawTypes/&[]runtime.RawExtension{} === RUN TestTranscodeRawTypes/&[]string{"foo"} === RUN TestTranscodeRawTypes/(*runtime.RawExtension)(nil) -=== RUN TestTranscodeRawTypes/&struct_{_I_fmt.Stringer_}{I:(*runtime.RawExtension)(0xc00027a060)} +=== RUN TestTranscodeRawTypes/&struct_{_I_fmt.Stringer_}{I:(*runtime.RawExtension)(0xc0003051a0)} === RUN TestTranscodeRawTypes/&struct_{_I_fmt.Stringer_}{I:fmt.Stringer(nil)} === RUN TestTranscodeRawTypes/&struct_{_I_int64_}{I:7} === RUN TestTranscodeRawTypes/&struct_{_E_runtime.RawExtension;_I_int64_}{E:runtime.RawExtension{Raw:[]uint8{0xd9,_0xd9,_0xf7,_0x7},_Object:runtime.Object(nil)},_I:7} @@ -5184,12 +5220,12 @@ === RUN TestTranscodeRawTypes/&[]v1.FieldsV1{v1.FieldsV1{Raw:[]uint8{0xa0}},_v1.FieldsV1{Raw:[]uint8{0xf6}}} === RUN TestTranscodeRawTypes/&[]v1.FieldsV1{} === RUN TestTranscodeRawTypes/(*v1.FieldsV1)(nil) -=== RUN TestTranscodeRawTypes/&struct_{_I_fmt.Stringer_}{I:(*v1.FieldsV1)(0xc00024aea0)} +=== RUN TestTranscodeRawTypes/&struct_{_I_fmt.Stringer_}{I:(*v1.FieldsV1)(0xc000322558)} === RUN TestTranscodeRawTypes/&struct_{_E_v1.FieldsV1;_I_int64_}{E:v1.FieldsV1{Raw:[]uint8{0xa0}},_I:7} === RUN TestTranscodeRawTypes/&struct_{_v1.FieldsV1_}{FieldsV1:v1.FieldsV1{Raw:[]uint8{0xa0}}} === RUN TestTranscodeRawTypes/&map[string]v1.FieldsV1{"hello":v1.FieldsV1{Raw:[]uint8{0xa0}}} === RUN TestTranscodeRawTypes/&map[string][]v1.FieldsV1{"hello":[]v1.FieldsV1{v1.FieldsV1{Raw:[]uint8{0xa0}}}} ---- PASS: TestTranscodeRawTypes (0.01s) +--- PASS: TestTranscodeRawTypes (0.00s) --- PASS: TestTranscodeRawTypes/ (0.00s) --- PASS: TestTranscodeRawTypes/&runtime.RawExtension{Raw:[]uint8{0xd9,_0xd9,_0xf7,_0x7},_Object:runtime.Object(nil)} (0.00s) --- PASS: TestTranscodeRawTypes/&runtime.RawExtension{Raw:[]uint8(nil),_Object:runtime.Object(nil)} (0.00s) @@ -5200,7 +5236,7 @@ --- PASS: TestTranscodeRawTypes/&[]runtime.RawExtension{} (0.00s) --- PASS: TestTranscodeRawTypes/&[]string{"foo"} (0.00s) --- PASS: TestTranscodeRawTypes/(*runtime.RawExtension)(nil) (0.00s) - --- PASS: TestTranscodeRawTypes/&struct_{_I_fmt.Stringer_}{I:(*runtime.RawExtension)(0xc00027a060)} (0.00s) + --- PASS: TestTranscodeRawTypes/&struct_{_I_fmt.Stringer_}{I:(*runtime.RawExtension)(0xc0003051a0)} (0.00s) --- PASS: TestTranscodeRawTypes/&struct_{_I_fmt.Stringer_}{I:fmt.Stringer(nil)} (0.00s) --- PASS: TestTranscodeRawTypes/&struct_{_I_int64_}{I:7} (0.00s) --- PASS: TestTranscodeRawTypes/&struct_{_E_runtime.RawExtension;_I_int64_}{E:runtime.RawExtension{Raw:[]uint8{0xd9,_0xd9,_0xf7,_0x7},_Object:runtime.Object(nil)},_I:7} (0.00s) @@ -5216,7 +5252,7 @@ --- PASS: TestTranscodeRawTypes/&[]v1.FieldsV1{v1.FieldsV1{Raw:[]uint8{0xa0}},_v1.FieldsV1{Raw:[]uint8{0xf6}}} (0.00s) --- PASS: TestTranscodeRawTypes/&[]v1.FieldsV1{} (0.00s) --- PASS: TestTranscodeRawTypes/(*v1.FieldsV1)(nil) (0.00s) - --- PASS: TestTranscodeRawTypes/&struct_{_I_fmt.Stringer_}{I:(*v1.FieldsV1)(0xc00024aea0)} (0.00s) + --- PASS: TestTranscodeRawTypes/&struct_{_I_fmt.Stringer_}{I:(*v1.FieldsV1)(0xc000322558)} (0.00s) --- PASS: TestTranscodeRawTypes/&struct_{_E_v1.FieldsV1;_I_int64_}{E:v1.FieldsV1{Raw:[]uint8{0xa0}},_I:7} (0.00s) --- PASS: TestTranscodeRawTypes/&struct_{_v1.FieldsV1_}{FieldsV1:v1.FieldsV1{Raw:[]uint8{0xa0}}} (0.00s) --- PASS: TestTranscodeRawTypes/&map[string]v1.FieldsV1{"hello":v1.FieldsV1{Raw:[]uint8{0xa0}}} (0.00s) @@ -5234,10 +5270,10 @@ === RUN TestFrameReaderClose --- PASS: TestFrameReaderClose (0.00s) PASS -ok k8s.io/apimachinery/pkg/runtime/serializer/cbor 0.080s +ok k8s.io/apimachinery/pkg/runtime/serializer/cbor 0.026s ? k8s.io/apimachinery/pkg/runtime/serializer/cbor/direct [no test files] === RUN TestBufferProviderPut ---- PASS: TestBufferProviderPut (0.03s) +--- PASS: TestBufferProviderPut (0.02s) === RUN TestAppendixA === RUN TestAppendixA/00 === RUN TestAppendixA/01 @@ -5303,67 +5339,67 @@ appendixa_test.go:561: expected decode error (only simple values false, true, and null have a clear analog) occurred: cbor: data item of cbor type primitives is not accepted by protocol: simple value 255 is not recognized === RUN TestAppendixA/c074323031332d30332d32315432303a30343a30305a appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   []uint8{ - -  0xc0, - +  0x54, - -  0x74, -    0x32, -    0x30, -    ... // 18 identical elements -   } + []uint8{ + - 0xc0, + + 0x54, + - 0x74, + 0x32, + 0x30, + ... // 18 identical elements + } appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - strings are encoded as the byte string major type appendixa_test.go:591: - times decode to interface{} as RFC3339 timestamps for JSON interoperability === RUN TestAppendixA/c11a514b67b0 appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   []uint8{ - -  0xc1, 0x1a, 0x51, 0x4b, 0x67, 0xb0, // -|..QKg.| - +  0x54, 0x32, 0x30, 0x31, 0x33, 0x2d, 0x30, 0x33, 0x2d, 0x32, 0x31, 0x54, 0x32, 0x30, 0x3a, 0x30, // +|T2013-03-21T20:0| - +  0x34, 0x3a, 0x30, 0x30, 0x5a, // +|4:00Z| -   } + []uint8{ + - 0xc1, 0x1a, 0x51, 0x4b, 0x67, 0xb0, // -|..QKg.| + + 0x54, 0x32, 0x30, 0x31, 0x33, 0x2d, 0x30, 0x33, 0x2d, 0x32, 0x31, 0x54, 0x32, 0x30, 0x3a, 0x30, // +|T2013-03-21T20:0| + + 0x34, 0x3a, 0x30, 0x30, 0x5a, // +|4:00Z| + } appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - strings are encoded as the byte string major type appendixa_test.go:591: - times decode to interface{} as RFC3339 timestamps for JSON interoperability === RUN TestAppendixA/c1fb41d452d9ec200000 appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   []uint8{ - -  0xc1, 0xfb, 0x41, 0xd4, 0x52, 0xd9, 0xec, 0x20, 0x00, 0x00, // -|..A.R.. ..| - +  0x56, 0x32, 0x30, 0x31, 0x33, 0x2d, 0x30, 0x33, 0x2d, 0x32, 0x31, 0x54, 0x32, 0x30, 0x3a, 0x30, // +|V2013-03-21T20:0| - +  0x34, 0x3a, 0x30, 0x30, 0x2e, 0x35, 0x5a, // +|4:00.5Z| -   } + []uint8{ + - 0xc1, 0xfb, 0x41, 0xd4, 0x52, 0xd9, 0xec, 0x20, 0x00, 0x00, // -|..A.R.. ..| + + 0x56, 0x32, 0x30, 0x31, 0x33, 0x2d, 0x30, 0x33, 0x2d, 0x32, 0x31, 0x54, 0x32, 0x30, 0x3a, 0x30, // +|V2013-03-21T20:0| + + 0x34, 0x3a, 0x30, 0x30, 0x2e, 0x35, 0x5a, // +|4:00.5Z| + } appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - strings are encoded as the byte string major type appendixa_test.go:591: - times decode to interface{} as RFC3339 timestamps for JSON interoperability === RUN TestAppendixA/d74401020304 appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   []uint8{ - -  0xd7, 0x44, 0x01, 0x02, 0x03, 0x04, // -|.D....| - +  0x48, 0x30, 0x31, 0x30, 0x32, 0x30, 0x33, 0x30, 0x34, // +|H01020304| -   } + []uint8{ + - 0xd7, 0x44, 0x01, 0x02, 0x03, 0x04, // -|.D....| + + 0x48, 0x30, 0x31, 0x30, 0x32, 0x30, 0x33, 0x30, 0x34, // +|H01020304| + } appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - decoding a byte string enclosed in an expected later encoding tag into an interface{} value automatically converts to the specified encoding for JSON interoperability === RUN TestAppendixA/d818456449455446 appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   []uint8{ - -  0xd8, - -  0x18, -    0x45, -    0x64, -    ... // 4 identical elements -   } + []uint8{ + - 0xd8, + - 0x18, + 0x45, + 0x64, + ... // 4 identical elements + } appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - unrecognized tag numbers are ignored === RUN TestAppendixA/d82076687474703a2f2f7777772e6578616d706c652e636f6d appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   []uint8{ - -  0xd8, - +  0x56, - -  0x20, - -  0x76, -    0x68, -    0x74, -    ... // 20 identical elements -   } + []uint8{ + - 0xd8, + + 0x56, + - 0x20, + - 0x76, + 0x68, + 0x74, + ... // 20 identical elements + } appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - strings are encoded as the byte string major type appendixa_test.go:591: - unrecognized tag numbers are ignored @@ -5371,72 +5407,72 @@ === RUN TestAppendixA/4401020304 === RUN TestAppendixA/60 appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   bytes.Join({ - -  "`", - +  "@", -   }, "") + bytes.Join({ + - "`", + + "@", + }, "") appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - strings are encoded as the byte string major type === RUN TestAppendixA/6161 appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   []uint8{ - -  0x61, - +  0x41, -    0x61, -   } + []uint8{ + - 0x61, + + 0x41, + 0x61, + } appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - strings are encoded as the byte string major type === RUN TestAppendixA/6449455446 appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   []uint8{ - -  0x64, - +  0x44, -    0x49, -    0x45, -    ... // 2 identical elements -   } + []uint8{ + - 0x64, + + 0x44, + 0x49, + 0x45, + ... // 2 identical elements + } appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - strings are encoded as the byte string major type === RUN TestAppendixA/62225c appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   []uint8{ - -  0x62, - +  0x42, -    0x22, -    0x5c, -   } + []uint8{ + - 0x62, + + 0x42, + 0x22, + 0x5c, + } appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - strings are encoded as the byte string major type === RUN TestAppendixA/62c3bc appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   []uint8{ - -  0x62, - +  0x42, -    0xc3, -    0xbc, -   } + []uint8{ + - 0x62, + + 0x42, + 0xc3, + 0xbc, + } appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - strings are encoded as the byte string major type === RUN TestAppendixA/63e6b0b4 appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   []uint8{ - -  0x63, - +  0x43, -    0xe6, -    0xb0, -    0xb4, -   } + []uint8{ + - 0x63, + + 0x43, + 0xe6, + 0xb0, + 0xb4, + } appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - strings are encoded as the byte string major type === RUN TestAppendixA/64f0908591 appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   []uint8{ - -  0x64, - +  0x44, -    0xf0, -    0x90, -    ... // 2 identical elements -   } + []uint8{ + - 0x64, + + 0x44, + 0xf0, + 0x90, + ... // 2 identical elements + } appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - strings are encoded as the byte string major type === RUN TestAppendixA/80 @@ -5448,200 +5484,201 @@ appendixa_test.go:561: expected decode error (integer map keys don't correspond with field names or unstructured keys) occurred: cbor: cannot unmarshal positive integer into Go value of type string === RUN TestAppendixA/a26161016162820203 appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   []uint8{ -    0xa2, - +  0x41, -    0x61, - -  0x61, -    0x01, - -  0x61, - +  0x41, -    0x62, -    0x82, -    ... // 2 identical elements -   } + []uint8{ + 0xa2, + + 0x41, + 0x61, + - 0x61, + + 0x01, + - 0x01, + + 0x41, + - 0x61, + 0x62, + 0x82, + ... // 2 identical elements + } appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - strings are encoded as the byte string major type === RUN TestAppendixA/826161a161626163 appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   []uint8{ -    0x82, - +  0x41, -    0x61, - -  0x61, -    0xa1, - -  0x61, - +  0x41, -    0x62, - -  0x61, - +  0x41, -    0x63, -   } + []uint8{ + 0x82, + + 0x41, + 0x61, + - 0x61, + 0xa1, + - 0x61, + + 0x41, + 0x62, + - 0x61, + + 0x41, + 0x63, + } appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - strings are encoded as the byte string major type === RUN TestAppendixA/a56161614161626142616361436164614461656145 appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   bytes.Join({ -    "\xa5", - -  "aaaAabaBacaCadaDaea", - +  "AaAAAbABAcACAdADAeA", -    "E", -   }, "") + bytes.Join({ + "\xa5", + - "aaaAabaBacaCadaDaea", + + "AaAAAbABAcACAdADAeA", + "E", + }, "") appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - strings are encoded as the byte string major type === RUN TestAppendixA/5f42010243030405ff appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   []uint8{ - -  0x5f, - +  0x45, - -  0x42, -    0x01, -    0x02, - -  0x43, -    0x03, -    0x04, -    0x05, - -  0xff, -   } + []uint8{ + - 0x5f, + + 0x45, + - 0x42, + 0x01, + 0x02, + - 0x43, + 0x03, + 0x04, + 0x05, + - 0xff, + } appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - indefinite-length strings are re-encoded with fixed length === RUN TestAppendixA/7f657374726561646d696e67ff appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   []uint8{ - -  0x7f, - +  0x49, - -  0x65, -    0x73, -    0x74, -    0x72, -    0x65, -    0x61, - -  0x64, -    0x6d, -    0x69, -    0x6e, -    0x67, - -  0xff, -   } + []uint8{ + - 0x7f, + + 0x49, + - 0x65, + 0x73, + 0x74, + 0x72, + 0x65, + 0x61, + - 0x64, + 0x6d, + 0x69, + 0x6e, + 0x67, + - 0xff, + } appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - strings are encoded as the byte string major type appendixa_test.go:591: - indefinite-length strings are re-encoded with fixed length === RUN TestAppendixA/9fff appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   []uint8{ - -  0x9f, 0xff, // -|..| - +  0x80, // +|.| -   } + []uint8{ + - 0x9f, 0xff, // -|..| + + 0x80, // +|.| + } appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - indefinite-length arrays are re-encoded with fixed length === RUN TestAppendixA/9f018202039f0405ffff appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   []uint8{ - -  0x9f, - +  0x83, -    0x01, -    0x82, -    0x02, -    0x03, - -  0x9f, - +  0x82, -    0x04, -    0x05, - -  0xff, - -  0xff, -   } + []uint8{ + - 0x9f, + + 0x83, + 0x01, + 0x82, + 0x02, + 0x03, + - 0x9f, + + 0x82, + 0x04, + 0x05, + - 0xff, + - 0xff, + } appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - indefinite-length arrays are re-encoded with fixed length === RUN TestAppendixA/9f01820203820405ff appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   []uint8{ - -  0x9f, - +  0x83, -    0x01, -    0x82, -    ... // 3 identical elements -    0x04, -    0x05, - -  0xff, -   } + []uint8{ + - 0x9f, + + 0x83, + 0x01, + 0x82, + ... // 3 identical elements + 0x04, + 0x05, + - 0xff, + } appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - indefinite-length arrays are re-encoded with fixed length === RUN TestAppendixA/83018202039f0405ff appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   []uint8{ -    ... // 3 identical elements -    0x02, -    0x03, - -  0x9f, - +  0x82, -    0x04, -    0x05, - -  0xff, -   } + []uint8{ + ... // 3 identical elements + 0x02, + 0x03, + - 0x9f, + + 0x82, + 0x04, + 0x05, + - 0xff, + } appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - indefinite-length arrays are re-encoded with fixed length === RUN TestAppendixA/83019f0203ff820405 appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   []uint8{ -    0x83, -    0x01, - -  0x9f, - +  0x82, -    0x02, -    0x03, - -  0xff, -    0x82, -    0x04, -    0x05, -   } + []uint8{ + 0x83, + 0x01, + - 0x9f, + + 0x82, + 0x02, + 0x03, + - 0xff, + 0x82, + 0x04, + 0x05, + } appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - indefinite-length arrays are re-encoded with fixed length === RUN TestAppendixA/9f0102030405060708090a0b0c0d0e0f101112131415161718181819ff appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   []uint8{ - -  0x9f, - +  0x98, - +  0x19, -    0x01, -    0x02, -    ... // 23 identical elements -    0x18, -    0x19, - -  0xff, -   } + []uint8{ + - 0x9f, + + 0x98, + + 0x19, + 0x01, + 0x02, + ... // 23 identical elements + 0x18, + 0x19, + - 0xff, + } appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - indefinite-length arrays are re-encoded with fixed length === RUN TestAppendixA/bf61610161629f0203ffff appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   []uint8{ - -  0xbf, 0x61, 0x61, 0x01, 0x61, 0x62, 0x9f, 0x02, 0x03, 0xff, 0xff, // -|.aa.ab.....| - +  0xa2, 0x41, 0x61, 0x01, 0x41, 0x62, 0x82, 0x02, 0x03, // +|.Aa.Ab...| -   } + []uint8{ + - 0xbf, 0x61, 0x61, 0x01, 0x61, 0x62, 0x9f, 0x02, 0x03, 0xff, 0xff, // -|.aa.ab.....| + + 0xa2, 0x41, 0x61, 0x01, 0x41, 0x62, 0x82, 0x02, 0x03, // +|.Aa.Ab...| + } appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - indefinite-length arrays are re-encoded with fixed length appendixa_test.go:591: - strings are encoded as the byte string major type appendixa_test.go:591: - indefinite-length maps are re-encoded with fixed length === RUN TestAppendixA/826161bf61626163ff appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   []uint8{ -    0x82, // |.| - -  0x61, 0x61, 0xbf, 0x61, 0x62, 0x61, 0x63, 0xff, // -|aa.abac.| - +  0x41, 0x61, 0xa1, 0x41, 0x62, 0x41, 0x63, // +|Aa.AbAc| -   } + []uint8{ + 0x82, // |.| + - 0x61, 0x61, 0xbf, 0x61, 0x62, 0x61, 0x63, 0xff, // -|aa.abac.| + + 0x41, 0x61, 0xa1, 0x41, 0x62, 0x41, 0x63, // +|Aa.AbAc| + } appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - strings are encoded as the byte string major type appendixa_test.go:591: - indefinite-length maps are re-encoded with fixed length === RUN TestAppendixA/bf6346756ef563416d7421ff appendixa_test.go:588: expecting the following differences from the example encoding on re-encode: -   []uint8{ - -  0xbf, 0x63, 0x46, 0x75, 0x6e, 0xf5, 0x63, 0x41, 0x6d, 0x74, 0x21, 0xff, // -|.cFun.cAmt!.| - +  0xa2, 0x43, 0x41, 0x6d, 0x74, 0x21, 0x43, 0x46, 0x75, 0x6e, 0xf5, // +|.CAmt!CFun.| -   } + []uint8{ + - 0xbf, 0x63, 0x46, 0x75, 0x6e, 0xf5, 0x63, 0x41, 0x6d, 0x74, 0x21, 0xff, // -|.cFun.cAmt!.| + + 0xa2, 0x43, 0x41, 0x6d, 0x74, 0x21, 0x43, 0x46, 0x75, 0x6e, 0xf5, // +|.CAmt!CFun.| + } appendixa_test.go:589: reasons for encoding differences: appendixa_test.go:591: - strings are encoded as the byte string major type appendixa_test.go:591: - indefinite-length maps are re-encoded with fixed length appendixa_test.go:591: - map entries are sorted ---- PASS: TestAppendixA (0.06s) +--- PASS: TestAppendixA (3.16s) --- PASS: TestAppendixA/00 (0.00s) --- PASS: TestAppendixA/01 (0.00s) --- PASS: TestAppendixA/0a (0.00s) @@ -5662,7 +5699,7 @@ --- PASS: TestAppendixA/3903e7 (0.00s) --- PASS: TestAppendixA/f90000 (0.00s) --- PASS: TestAppendixA/f98000 (0.00s) - --- PASS: TestAppendixA/f93c00 (0.01s) + --- PASS: TestAppendixA/f93c00 (0.00s) --- PASS: TestAppendixA/fb3ff199999999999a (0.00s) --- PASS: TestAppendixA/f93e00 (0.00s) --- PASS: TestAppendixA/f97bff (0.00s) @@ -5674,7 +5711,7 @@ --- PASS: TestAppendixA/f9c400 (0.00s) --- PASS: TestAppendixA/fbc010666666666666 (0.00s) --- PASS: TestAppendixA/f97c00 (0.00s) - --- PASS: TestAppendixA/f97e00 (0.01s) + --- PASS: TestAppendixA/f97e00 (0.00s) --- PASS: TestAppendixA/f9fc00 (0.00s) --- PASS: TestAppendixA/fa7f800000 (0.00s) --- PASS: TestAppendixA/fa7fc00000 (0.00s) @@ -5690,8 +5727,8 @@ --- PASS: TestAppendixA/f8ff (0.00s) --- PASS: TestAppendixA/c074323031332d30332d32315432303a30343a30305a (0.00s) --- PASS: TestAppendixA/c11a514b67b0 (0.00s) - --- PASS: TestAppendixA/c1fb41d452d9ec200000 (0.01s) - --- PASS: TestAppendixA/d74401020304 (0.00s) + --- PASS: TestAppendixA/c1fb41d452d9ec200000 (0.00s) + --- PASS: TestAppendixA/d74401020304 (0.01s) --- PASS: TestAppendixA/d818456449455446 (0.00s) --- PASS: TestAppendixA/d82076687474703a2f2f7777772e6578616d706c652e636f6d (0.00s) --- PASS: TestAppendixA/40 (0.00s) @@ -5702,7 +5739,7 @@ --- PASS: TestAppendixA/62225c (0.00s) --- PASS: TestAppendixA/62c3bc (0.00s) --- PASS: TestAppendixA/63e6b0b4 (0.00s) - --- PASS: TestAppendixA/64f0908591 (0.00s) + --- PASS: TestAppendixA/64f0908591 (3.13s) --- PASS: TestAppendixA/80 (0.00s) --- PASS: TestAppendixA/83010203 (0.00s) --- PASS: TestAppendixA/8301820203820405 (0.00s) @@ -5720,15 +5757,15 @@ --- PASS: TestAppendixA/83018202039f0405ff (0.00s) --- PASS: TestAppendixA/83019f0203ff820405 (0.00s) --- PASS: TestAppendixA/9f0102030405060708090a0b0c0d0e0f101112131415161718181819ff (0.00s) - --- PASS: TestAppendixA/bf61610161629f0203ffff (0.01s) + --- PASS: TestAppendixA/bf61610161629f0203ffff (0.00s) --- PASS: TestAppendixA/826161bf61626163ff (0.00s) --- PASS: TestAppendixA/bf6346756ef563416d7421ff (0.00s) === RUN TestCheckUnsupportedMarshalers === RUN TestCheckUnsupportedMarshalers/accepted === RUN TestCheckUnsupportedMarshalers/rejected ---- PASS: TestCheckUnsupportedMarshalers (0.00s) +--- PASS: TestCheckUnsupportedMarshalers (0.01s) --- PASS: TestCheckUnsupportedMarshalers/accepted (0.00s) - --- PASS: TestCheckUnsupportedMarshalers/rejected (0.00s) + --- PASS: TestCheckUnsupportedMarshalers/rejected (0.01s) === RUN TestDecode === RUN TestDecode/unsigned_integer === RUN TestDecode/unsigned_integer/unsigned_integer_decodes_to_interface{}_as_int64 @@ -6747,7 +6784,7 @@ === RUN TestDecode/tag/unrecognized/bigfloat === RUN TestDecode/tag/unrecognized/bigfloat/bigfloat/mode=Decode === RUN TestDecode/tag/unrecognized/bigfloat/bigfloat/mode=DecodeLax ---- PASS: TestDecode (0.14s) +--- PASS: TestDecode (0.13s) --- PASS: TestDecode/unsigned_integer (0.00s) --- PASS: TestDecode/unsigned_integer/unsigned_integer_decodes_to_interface{}_as_int64 (0.00s) --- PASS: TestDecode/unsigned_integer/unsigned_integer_decodes_to_interface{}_as_int64/unsigned_integer_decodes_to_interface{}_as_int64/mode=Decode (0.00s) @@ -6771,7 +6808,7 @@ --- PASS: TestDecode/negative_integer/min_negative_integer_value_supported_by_cbor:_-2^64 (0.00s) --- PASS: TestDecode/negative_integer/min_negative_integer_value_supported_by_cbor:_-2^64/min_negative_integer_value_supported_by_cbor:_-2^64/mode=Decode (0.00s) --- PASS: TestDecode/negative_integer/min_negative_integer_value_supported_by_cbor:_-2^64/min_negative_integer_value_supported_by_cbor:_-2^64/mode=DecodeLax (0.00s) - --- PASS: TestDecode/byte_string (0.01s) + --- PASS: TestDecode/byte_string (0.00s) --- PASS: TestDecode/byte_string/empty_byte_string (0.00s) --- PASS: TestDecode/byte_string/empty_byte_string/empty_byte_string/mode=Decode (0.00s) --- PASS: TestDecode/byte_string/empty_byte_string/empty_byte_string/mode=DecodeLax (0.00s) @@ -6810,7 +6847,7 @@ --- PASS: TestDecode/array/nested_indefinite-length_array (0.00s) --- PASS: TestDecode/array/nested_indefinite-length_array/nested_indefinite-length_array/mode=Decode (0.00s) --- PASS: TestDecode/array/nested_indefinite-length_array/nested_indefinite-length_array/mode=DecodeLax (0.00s) - --- PASS: TestDecode/map (0.01s) + --- PASS: TestDecode/map (0.02s) --- PASS: TestDecode/map/reject_duplicate_negative_int_keys_into_struct (0.00s) --- PASS: TestDecode/map/reject_duplicate_negative_int_keys_into_struct/reject_duplicate_negative_int_keys_into_struct/mode=DecodeLax (0.00s) --- PASS: TestDecode/map/reject_duplicate_negative_int_keys_into_map (0.00s) @@ -6824,9 +6861,9 @@ --- PASS: TestDecode/map/reject_duplicate_text_string_keys_into_struct (0.00s) --- PASS: TestDecode/map/reject_duplicate_text_string_keys_into_struct/reject_duplicate_text_string_keys_into_struct/mode=Decode (0.00s) --- PASS: TestDecode/map/reject_duplicate_text_string_keys_into_struct/reject_duplicate_text_string_keys_into_struct/mode=DecodeLax (0.00s) - --- PASS: TestDecode/map/reject_duplicate_text_string_keys_into_map (0.00s) + --- PASS: TestDecode/map/reject_duplicate_text_string_keys_into_map (0.02s) --- PASS: TestDecode/map/reject_duplicate_text_string_keys_into_map/reject_duplicate_text_string_keys_into_map/mode=Decode (0.00s) - --- PASS: TestDecode/map/reject_duplicate_text_string_keys_into_map/reject_duplicate_text_string_keys_into_map/mode=DecodeLax (0.00s) + --- PASS: TestDecode/map/reject_duplicate_text_string_keys_into_map/reject_duplicate_text_string_keys_into_map/mode=DecodeLax (0.02s) --- PASS: TestDecode/map/reject_duplicate_byte_string_keys_into_map (0.00s) --- PASS: TestDecode/map/reject_duplicate_byte_string_keys_into_map/reject_duplicate_byte_string_keys_into_map/mode=Decode (0.00s) --- PASS: TestDecode/map/reject_duplicate_byte_string_keys_into_map/reject_duplicate_byte_string_keys_into_map/mode=DecodeLax (0.00s) @@ -6881,7 +6918,7 @@ --- PASS: TestDecode/map/map_with_mixed_string_key_types (0.00s) --- PASS: TestDecode/map/map_with_mixed_string_key_types/map_with_mixed_string_key_types/mode=Decode (0.00s) --- PASS: TestDecode/map/map_with_mixed_string_key_types/map_with_mixed_string_key_types/mode=DecodeLax (0.00s) - --- PASS: TestDecode/floating-point_number (0.00s) + --- PASS: TestDecode/floating-point_number (0.02s) --- PASS: TestDecode/floating-point_number/half_precision_infinity (0.00s) --- PASS: TestDecode/floating-point_number/half_precision_infinity/half_precision_infinity/mode=Decode (0.00s) --- PASS: TestDecode/floating-point_number/half_precision_infinity/half_precision_infinity/mode=DecodeLax (0.00s) @@ -6906,7 +6943,7 @@ --- PASS: TestDecode/floating-point_number/single_precision_NaN (0.00s) --- PASS: TestDecode/floating-point_number/single_precision_NaN/single_precision_NaN/mode=Decode (0.00s) --- PASS: TestDecode/floating-point_number/single_precision_NaN/single_precision_NaN/mode=DecodeLax (0.00s) - --- PASS: TestDecode/floating-point_number/double_precision_NaN (0.00s) + --- PASS: TestDecode/floating-point_number/double_precision_NaN (0.02s) --- PASS: TestDecode/floating-point_number/double_precision_NaN/double_precision_NaN/mode=Decode (0.00s) --- PASS: TestDecode/floating-point_number/double_precision_NaN/double_precision_NaN/mode=DecodeLax (0.00s) --- PASS: TestDecode/floating-point_number/smallest_nonzero_float64 (0.00s) @@ -6933,7 +6970,7 @@ --- PASS: TestDecode/floating-point_number/half_precision_without_fractional_component (0.00s) --- PASS: TestDecode/floating-point_number/half_precision_without_fractional_component/half_precision_without_fractional_component/mode=Decode (0.00s) --- PASS: TestDecode/floating-point_number/half_precision_without_fractional_component/half_precision_without_fractional_component/mode=DecodeLax (0.00s) - --- PASS: TestDecode/simple_value (0.10s) + --- PASS: TestDecode/simple_value (0.08s) --- PASS: TestDecode/simple_value/simple_value_20 (0.00s) --- PASS: TestDecode/simple_value/simple_value_20/simple_value_20/mode=Decode (0.00s) --- PASS: TestDecode/simple_value/simple_value_20/simple_value_20/mode=DecodeLax (0.00s) @@ -7009,8 +7046,8 @@ --- PASS: TestDecode/simple_value/simple_value_24 (0.00s) --- PASS: TestDecode/simple_value/simple_value_24/simple_value_24/mode=Decode (0.00s) --- PASS: TestDecode/simple_value/simple_value_24/simple_value_24/mode=DecodeLax (0.00s) - --- PASS: TestDecode/simple_value/simple_value_25 (0.01s) - --- PASS: TestDecode/simple_value/simple_value_25/simple_value_25/mode=Decode (0.01s) + --- PASS: TestDecode/simple_value/simple_value_25 (0.00s) + --- PASS: TestDecode/simple_value/simple_value_25/simple_value_25/mode=Decode (0.00s) --- PASS: TestDecode/simple_value/simple_value_25/simple_value_25/mode=DecodeLax (0.00s) --- PASS: TestDecode/simple_value/simple_value_26 (0.00s) --- PASS: TestDecode/simple_value/simple_value_26/simple_value_26/mode=Decode (0.00s) @@ -7105,9 +7142,9 @@ --- PASS: TestDecode/simple_value/simple_value_56 (0.00s) --- PASS: TestDecode/simple_value/simple_value_56/simple_value_56/mode=Decode (0.00s) --- PASS: TestDecode/simple_value/simple_value_56/simple_value_56/mode=DecodeLax (0.00s) - --- PASS: TestDecode/simple_value/simple_value_57 (0.00s) + --- PASS: TestDecode/simple_value/simple_value_57 (0.02s) --- PASS: TestDecode/simple_value/simple_value_57/simple_value_57/mode=Decode (0.00s) - --- PASS: TestDecode/simple_value/simple_value_57/simple_value_57/mode=DecodeLax (0.00s) + --- PASS: TestDecode/simple_value/simple_value_57/simple_value_57/mode=DecodeLax (0.02s) --- PASS: TestDecode/simple_value/simple_value_58 (0.00s) --- PASS: TestDecode/simple_value/simple_value_58/simple_value_58/mode=Decode (0.00s) --- PASS: TestDecode/simple_value/simple_value_58/simple_value_58/mode=DecodeLax (0.00s) @@ -7258,7 +7295,7 @@ --- PASS: TestDecode/simple_value/simple_value_107 (0.00s) --- PASS: TestDecode/simple_value/simple_value_107/simple_value_107/mode=Decode (0.00s) --- PASS: TestDecode/simple_value/simple_value_107/simple_value_107/mode=DecodeLax (0.00s) - --- PASS: TestDecode/simple_value/simple_value_108 (0.01s) + --- PASS: TestDecode/simple_value/simple_value_108 (0.00s) --- PASS: TestDecode/simple_value/simple_value_108/simple_value_108/mode=Decode (0.00s) --- PASS: TestDecode/simple_value/simple_value_108/simple_value_108/mode=DecodeLax (0.00s) --- PASS: TestDecode/simple_value/simple_value_109 (0.00s) @@ -7324,7 +7361,7 @@ --- PASS: TestDecode/simple_value/simple_value_129 (0.00s) --- PASS: TestDecode/simple_value/simple_value_129/simple_value_129/mode=Decode (0.00s) --- PASS: TestDecode/simple_value/simple_value_129/simple_value_129/mode=DecodeLax (0.00s) - --- PASS: TestDecode/simple_value/simple_value_130 (0.01s) + --- PASS: TestDecode/simple_value/simple_value_130 (0.00s) --- PASS: TestDecode/simple_value/simple_value_130/simple_value_130/mode=Decode (0.00s) --- PASS: TestDecode/simple_value/simple_value_130/simple_value_130/mode=DecodeLax (0.00s) --- PASS: TestDecode/simple_value/simple_value_131 (0.00s) @@ -7432,9 +7469,9 @@ --- PASS: TestDecode/simple_value/simple_value_165 (0.00s) --- PASS: TestDecode/simple_value/simple_value_165/simple_value_165/mode=Decode (0.00s) --- PASS: TestDecode/simple_value/simple_value_165/simple_value_165/mode=DecodeLax (0.00s) - --- PASS: TestDecode/simple_value/simple_value_166 (0.00s) + --- PASS: TestDecode/simple_value/simple_value_166 (0.01s) --- PASS: TestDecode/simple_value/simple_value_166/simple_value_166/mode=Decode (0.00s) - --- PASS: TestDecode/simple_value/simple_value_166/simple_value_166/mode=DecodeLax (0.00s) + --- PASS: TestDecode/simple_value/simple_value_166/simple_value_166/mode=DecodeLax (0.01s) --- PASS: TestDecode/simple_value/simple_value_167 (0.00s) --- PASS: TestDecode/simple_value/simple_value_167/simple_value_167/mode=Decode (0.00s) --- PASS: TestDecode/simple_value/simple_value_167/simple_value_167/mode=DecodeLax (0.00s) @@ -7543,7 +7580,7 @@ --- PASS: TestDecode/simple_value/simple_value_202 (0.00s) --- PASS: TestDecode/simple_value/simple_value_202/simple_value_202/mode=Decode (0.00s) --- PASS: TestDecode/simple_value/simple_value_202/simple_value_202/mode=DecodeLax (0.00s) - --- PASS: TestDecode/simple_value/simple_value_203 (0.01s) + --- PASS: TestDecode/simple_value/simple_value_203 (0.00s) --- PASS: TestDecode/simple_value/simple_value_203/simple_value_203/mode=Decode (0.00s) --- PASS: TestDecode/simple_value/simple_value_203/simple_value_203/mode=DecodeLax (0.00s) --- PASS: TestDecode/simple_value/simple_value_204 (0.00s) @@ -7621,10 +7658,10 @@ --- PASS: TestDecode/simple_value/simple_value_228 (0.00s) --- PASS: TestDecode/simple_value/simple_value_228/simple_value_228/mode=Decode (0.00s) --- PASS: TestDecode/simple_value/simple_value_228/simple_value_228/mode=DecodeLax (0.00s) - --- PASS: TestDecode/simple_value/simple_value_229 (0.00s) + --- PASS: TestDecode/simple_value/simple_value_229 (0.01s) --- PASS: TestDecode/simple_value/simple_value_229/simple_value_229/mode=Decode (0.00s) - --- PASS: TestDecode/simple_value/simple_value_229/simple_value_229/mode=DecodeLax (0.00s) - --- PASS: TestDecode/simple_value/simple_value_230 (0.01s) + --- PASS: TestDecode/simple_value/simple_value_229/simple_value_229/mode=DecodeLax (0.01s) + --- PASS: TestDecode/simple_value/simple_value_230 (0.00s) --- PASS: TestDecode/simple_value/simple_value_230/simple_value_230/mode=Decode (0.00s) --- PASS: TestDecode/simple_value/simple_value_230/simple_value_230/mode=DecodeLax (0.00s) --- PASS: TestDecode/simple_value/simple_value_231 (0.00s) @@ -7702,7 +7739,7 @@ --- PASS: TestDecode/simple_value/simple_value_255 (0.00s) --- PASS: TestDecode/simple_value/simple_value_255/simple_value_255/mode=Decode (0.00s) --- PASS: TestDecode/simple_value/simple_value_255/simple_value_255/mode=DecodeLax (0.00s) - --- PASS: TestDecode/tag (0.01s) + --- PASS: TestDecode/tag (0.00s) --- PASS: TestDecode/tag/rfc3339_time (0.00s) --- PASS: TestDecode/tag/rfc3339_time/tag_0_RFC3339_text_string (0.00s) --- PASS: TestDecode/tag/rfc3339_time/tag_0_RFC3339_text_string/tag_0_RFC3339_text_string/mode=Decode (0.00s) @@ -7758,10 +7795,10 @@ --- PASS: TestDecode/tag/negative_bignum/rejected (0.00s) --- PASS: TestDecode/tag/negative_bignum/rejected/rejected/mode=Decode (0.00s) --- PASS: TestDecode/tag/negative_bignum/rejected/rejected/mode=DecodeLax (0.00s) - --- PASS: TestDecode/tag/unrecognized (0.01s) - --- PASS: TestDecode/tag/unrecognized/decimal_fraction (0.01s) + --- PASS: TestDecode/tag/unrecognized (0.00s) + --- PASS: TestDecode/tag/unrecognized/decimal_fraction (0.00s) --- PASS: TestDecode/tag/unrecognized/decimal_fraction/decimal_fraction/mode=Decode (0.00s) - --- PASS: TestDecode/tag/unrecognized/decimal_fraction/decimal_fraction/mode=DecodeLax (0.01s) + --- PASS: TestDecode/tag/unrecognized/decimal_fraction/decimal_fraction/mode=DecodeLax (0.00s) --- PASS: TestDecode/tag/unrecognized/bigfloat (0.00s) --- PASS: TestDecode/tag/unrecognized/bigfloat/bigfloat/mode=Decode (0.00s) --- PASS: TestDecode/tag/unrecognized/bigfloat/bigfloat/mode=DecodeLax (0.00s) @@ -7996,7 +8033,7 @@ === RUN TestRoundtrip/enc=Encode/dec=DecodeLax/nil_pointer_to_map_as_struct_field_with_omitempty === RUN TestRoundtrip/enc=EncodeNondeterministic/dec=Decode/nil_pointer_to_map_as_struct_field_with_omitempty === RUN TestRoundtrip/enc=EncodeNondeterministic/dec=DecodeLax/nil_pointer_to_map_as_struct_field_with_omitempty ---- PASS: TestRoundtrip (0.04s) +--- PASS: TestRoundtrip (0.02s) --- PASS: TestRoundtrip/enc=Encode/dec=Decode/nil_slice (0.00s) --- PASS: TestRoundtrip/enc=Encode/dec=DecodeLax/nil_slice (0.00s) --- PASS: TestRoundtrip/enc=EncodeNondeterministic/dec=Decode/nil_slice (0.00s) @@ -8157,7 +8194,7 @@ --- PASS: TestRoundtrip/enc=Encode/dec=DecodeLax/float32_no_fractional_component (0.00s) --- PASS: TestRoundtrip/enc=EncodeNondeterministic/dec=Decode/float32_no_fractional_component (0.00s) --- PASS: TestRoundtrip/enc=EncodeNondeterministic/dec=DecodeLax/float32_no_fractional_component (0.00s) - --- PASS: TestRoundtrip/enc=Encode/dec=Decode/time.Time (0.01s) + --- PASS: TestRoundtrip/enc=Encode/dec=Decode/time.Time (0.00s) --- PASS: TestRoundtrip/enc=Encode/dec=DecodeLax/time.Time (0.00s) --- PASS: TestRoundtrip/enc=EncodeNondeterministic/dec=Decode/time.Time (0.00s) --- PASS: TestRoundtrip/enc=EncodeNondeterministic/dec=DecodeLax/time.Time (0.00s) @@ -8216,28 +8253,28 @@ --- PASS: TestRoundtripTextEncoding/enc=EncodeNondeterministic/dec=DecodeLax/byte_slice (0.00s) --- PASS: TestRoundtripTextEncoding/enc=EncodeNondeterministic/dec=DecodeLax/string (0.00s) PASS -ok k8s.io/apimachinery/pkg/runtime/serializer/cbor/internal/modes 0.330s +ok k8s.io/apimachinery/pkg/runtime/serializer/cbor/internal/modes 3.378s === RUN TestJSONLimits === RUN TestJSONLimits/3MB_of_deeply_nested_slices -=== RUN TestJSONLimits/3MB_of_deeply_nested_slices/utiljson === RUN TestJSONLimits/3MB_of_deeply_nested_slices/gojson +=== RUN TestJSONLimits/3MB_of_deeply_nested_slices/utiljson === RUN TestJSONLimits/3MB_of_unbalanced_nested_slices -=== RUN TestJSONLimits/3MB_of_unbalanced_nested_slices/gojson === RUN TestJSONLimits/3MB_of_unbalanced_nested_slices/utiljson +=== RUN TestJSONLimits/3MB_of_unbalanced_nested_slices/gojson === RUN TestJSONLimits/3MB_of_deeply_nested_maps === RUN TestJSONLimits/3MB_of_deeply_nested_maps/gojson === RUN TestJSONLimits/3MB_of_deeply_nested_maps/utiljson === RUN TestJSONLimits/3MB_of_unbalanced_nested_maps === RUN TestJSONLimits/3MB_of_unbalanced_nested_maps/gojson === RUN TestJSONLimits/3MB_of_unbalanced_nested_maps/utiljson ---- PASS: TestJSONLimits (0.31s) +--- PASS: TestJSONLimits (0.16s) --- PASS: TestJSONLimits/3MB_of_deeply_nested_slices (0.00s) - --- PASS: TestJSONLimits/3MB_of_deeply_nested_slices/utiljson (0.00s) --- PASS: TestJSONLimits/3MB_of_deeply_nested_slices/gojson (0.00s) - --- PASS: TestJSONLimits/3MB_of_unbalanced_nested_slices (0.01s) - --- PASS: TestJSONLimits/3MB_of_unbalanced_nested_slices/gojson (0.01s) + --- PASS: TestJSONLimits/3MB_of_deeply_nested_slices/utiljson (0.00s) + --- PASS: TestJSONLimits/3MB_of_unbalanced_nested_slices (0.00s) --- PASS: TestJSONLimits/3MB_of_unbalanced_nested_slices/utiljson (0.00s) - --- PASS: TestJSONLimits/3MB_of_deeply_nested_maps (0.00s) + --- PASS: TestJSONLimits/3MB_of_unbalanced_nested_slices/gojson (0.00s) + --- PASS: TestJSONLimits/3MB_of_deeply_nested_maps (0.01s) --- PASS: TestJSONLimits/3MB_of_deeply_nested_maps/gojson (0.00s) --- PASS: TestJSONLimits/3MB_of_deeply_nested_maps/utiljson (0.00s) --- PASS: TestJSONLimits/3MB_of_unbalanced_nested_maps (0.00s) @@ -8246,7 +8283,7 @@ === RUN TestSimpleMetaFactoryInterpret --- PASS: TestSimpleMetaFactoryInterpret (0.00s) === RUN TestDecode ---- PASS: TestDecode (0.01s) +--- PASS: TestDecode (0.00s) === RUN TestCacheableObject === RUN TestCacheableObject/delegate === RUN TestCacheableObject/delegate_return_self @@ -8263,14 +8300,14 @@ === RUN TestEncode/text_marshaler_keys_can_compare_inequal_but_serialize_to_duplicates === RUN TestEncode/time.Time_keys_can_compare_inequal_but_serialize_to_duplicates_because_time.Time_implements_TextMarshaler === RUN TestEncode/metav1.Time_keys_can_compare_inequal_but_serialize_to_duplicates_because_metav1.Time_embeds_time.Time_which_implements_TextMarshaler ---- PASS: TestEncode (0.01s) +--- PASS: TestEncode (0.00s) --- PASS: TestEncode/only_tagged_field_is_considered_if_any_are_tagged (0.00s) --- PASS: TestEncode/all_duplicate_fields_are_ignored (0.00s) --- PASS: TestEncode/text_marshaler_keys_can_compare_inequal_but_serialize_to_duplicates (0.00s) --- PASS: TestEncode/time.Time_keys_can_compare_inequal_but_serialize_to_duplicates_because_time.Time_implements_TextMarshaler (0.00s) --- PASS: TestEncode/metav1.Time_keys_can_compare_inequal_but_serialize_to_duplicates_because_metav1.Time_embeds_time.Time_which_implements_TextMarshaler (0.00s) PASS -ok k8s.io/apimachinery/pkg/runtime/serializer/json 0.412s +ok k8s.io/apimachinery/pkg/runtime/serializer/json 0.212s === RUN TestCacheableObject === RUN TestCacheableObject/delegate === RUN TestCacheableObject/delegate_return_self @@ -8300,20 +8337,20 @@ --- PASS: TestRawSerializerEncodeWithAllocator (0.00s) --- PASS: TestRawSerializerEncodeWithAllocator/encode_a_bufferedReverseMarshaller_obj (0.00s) PASS -ok k8s.io/apimachinery/pkg/runtime/serializer/protobuf 0.060s +ok k8s.io/apimachinery/pkg/runtime/serializer/protobuf 0.021s ? k8s.io/apimachinery/pkg/runtime/serializer/recognizer [no test files] === RUN TestRecognizer recognizer_test.go:49: &testing.A{} recognizer_test.go:60: &testing.A{} --- PASS: TestRecognizer (0.00s) PASS -ok k8s.io/apimachinery/pkg/runtime/serializer/recognizer/testing 0.049s +ok k8s.io/apimachinery/pkg/runtime/serializer/recognizer/testing 0.025s === RUN TestEmptyDecoder --- PASS: TestEmptyDecoder (0.00s) === RUN TestDecoder --- PASS: TestDecoder (0.12s) PASS -ok k8s.io/apimachinery/pkg/runtime/serializer/streaming 0.158s +ok k8s.io/apimachinery/pkg/runtime/serializer/streaming 0.155s === RUN TestNestedDecode --- PASS: TestNestedDecode (0.00s) === RUN TestNestedDecodeStrictDecodingError @@ -8346,7 +8383,7 @@ === RUN TestDecodeUnstructured --- PASS: TestDecodeUnstructured (0.00s) PASS -ok k8s.io/apimachinery/pkg/runtime/serializer/versioning 0.055s +ok k8s.io/apimachinery/pkg/runtime/serializer/versioning 0.036s === RUN TestInterpret === RUN TestInterpret/YAMLSuccessfullyInterpretVK === RUN TestInterpret/YAMLSuccessfullyInterpretGVK @@ -8385,7 +8422,7 @@ --- PASS: TestInterpret/JSONSuccessfullyInterpretK (0.00s) --- PASS: TestInterpret/JSONSuccessfullyInterpretEmptyString (0.00s) --- PASS: TestInterpret/JSONSuccessfullyInterpretEmptyObject (0.00s) - --- PASS: TestInterpret/JSONSuccessfullyInterpretMultiDoc (0.00s) + --- PASS: TestInterpret/JSONSuccessfullyInterpretMultiDoc (0.01s) --- PASS: TestInterpret/JSONSuccessfullyWrongFormat (0.00s) --- PASS: TestInterpret/JSONFailInterpretArray (0.00s) --- PASS: TestInterpret/JSONFailInterpretWrongSyntax (0.00s) @@ -8397,26 +8434,26 @@ === RUN TestYAMLLimits/deeply_nested_slices/sigsyaml === RUN TestYAMLLimits/deeply_nested_slices/utilyaml === RUN TestYAMLLimits/deeply_nested_maps -=== RUN TestYAMLLimits/deeply_nested_maps/sigsyaml === RUN TestYAMLLimits/deeply_nested_maps/utilyaml +=== RUN TestYAMLLimits/deeply_nested_maps/sigsyaml === RUN TestYAMLLimits/deeply_nested_indents -=== RUN TestYAMLLimits/deeply_nested_indents/sigsyaml === RUN TestYAMLLimits/deeply_nested_indents/utilyaml ---- PASS: TestYAMLLimits (0.73s) - --- PASS: TestYAMLLimits/arrays_of_string_aliases (0.01s) +=== RUN TestYAMLLimits/deeply_nested_indents/sigsyaml +--- PASS: TestYAMLLimits (0.42s) + --- PASS: TestYAMLLimits/arrays_of_string_aliases (0.02s) --- PASS: TestYAMLLimits/arrays_of_string_aliases/sigsyaml (0.01s) - --- PASS: TestYAMLLimits/arrays_of_string_aliases/utilyaml (0.00s) - --- PASS: TestYAMLLimits/deeply_nested_slices (0.14s) - --- PASS: TestYAMLLimits/deeply_nested_slices/sigsyaml (0.06s) - --- PASS: TestYAMLLimits/deeply_nested_slices/utilyaml (0.09s) - --- PASS: TestYAMLLimits/deeply_nested_maps (0.14s) - --- PASS: TestYAMLLimits/deeply_nested_maps/sigsyaml (0.07s) - --- PASS: TestYAMLLimits/deeply_nested_maps/utilyaml (0.06s) - --- PASS: TestYAMLLimits/deeply_nested_indents (0.11s) - --- PASS: TestYAMLLimits/deeply_nested_indents/sigsyaml (0.05s) - --- PASS: TestYAMLLimits/deeply_nested_indents/utilyaml (0.06s) + --- PASS: TestYAMLLimits/arrays_of_string_aliases/utilyaml (0.01s) + --- PASS: TestYAMLLimits/deeply_nested_slices (0.08s) + --- PASS: TestYAMLLimits/deeply_nested_slices/sigsyaml (0.04s) + --- PASS: TestYAMLLimits/deeply_nested_slices/utilyaml (0.05s) + --- PASS: TestYAMLLimits/deeply_nested_maps (0.08s) + --- PASS: TestYAMLLimits/deeply_nested_maps/utilyaml (0.05s) + --- PASS: TestYAMLLimits/deeply_nested_maps/sigsyaml (0.03s) + --- PASS: TestYAMLLimits/deeply_nested_indents (0.05s) + --- PASS: TestYAMLLimits/deeply_nested_indents/utilyaml (0.04s) + --- PASS: TestYAMLLimits/deeply_nested_indents/sigsyaml (0.02s) PASS -ok k8s.io/apimachinery/pkg/runtime/serializer/yaml 0.768s +ok k8s.io/apimachinery/pkg/runtime/serializer/yaml 0.480s ? k8s.io/apimachinery/pkg/runtime/testing [no test files] ? k8s.io/apimachinery/pkg/selection [no test files] === RUN TestIsList @@ -8434,7 +8471,7 @@ === RUN TestSetListToMatchingType --- PASS: TestSetListToMatchingType (0.00s) === RUN TestSetExtractListRoundTrip ---- PASS: TestSetExtractListRoundTrip (0.01s) +--- PASS: TestSetExtractListRoundTrip (0.00s) === RUN TestAPIObjectMeta --- PASS: TestAPIObjectMeta (0.00s) === RUN TestGenericTypeMeta @@ -8505,7 +8542,7 @@ --- PASS: TestOwnerReferences/2 (0.00s) --- PASS: TestOwnerReferences/1 (0.00s) PASS -ok k8s.io/apimachinery/pkg/test 0.237s +ok k8s.io/apimachinery/pkg/test 0.044s ? k8s.io/apimachinery/pkg/types [no test files] === RUN TestExpiringCache --- PASS: TestExpiringCache (0.00s) @@ -8524,7 +8561,7 @@ --- PASS: TestGarbageCollection/three_entries_weird_order (0.00s) --- PASS: TestGarbageCollection/expire_multiple_entries_in_one_cycle (0.00s) === RUN TestStressExpiringCache ---- PASS: TestStressExpiringCache (5.09s) +--- PASS: TestStressExpiringCache (5.10s) === RUN TestSimpleGet --- PASS: TestSimpleGet (0.00s) === RUN TestSimpleRemove @@ -8536,13 +8573,13 @@ === RUN TestLRUOverflow --- PASS: TestLRUOverflow (0.00s) === RUN TestAddBringsToFront ---- PASS: TestAddBringsToFront (0.01s) +--- PASS: TestAddBringsToFront (0.00s) === RUN TestGetBringsToFront --- PASS: TestGetBringsToFront (0.00s) === RUN TestLRUKeys --- PASS: TestLRUKeys (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/cache 5.280s +ok k8s.io/apimachinery/pkg/util/cache 5.133s ? k8s.io/apimachinery/pkg/util/diff [no test files] === RUN TestPretty --- PASS: TestPretty (0.00s) @@ -8551,7 +8588,7 @@ === RUN TestOneLine --- PASS: TestOneLine (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/dump 0.180s +ok k8s.io/apimachinery/pkg/util/dump 0.017s === RUN TestHumanDuration === RUN TestHumanDuration/1s === RUN TestHumanDuration/1m10s @@ -8563,7 +8600,7 @@ === RUN TestHumanDuration/8808h0m0s === RUN TestHumanDuration/17545h0m0s === RUN TestHumanDuration/70082h0m0s ---- PASS: TestHumanDuration (0.00s) +--- PASS: TestHumanDuration (0.01s) --- PASS: TestHumanDuration/1s (0.00s) --- PASS: TestHumanDuration/1m10s (0.00s) --- PASS: TestHumanDuration/3m10s (0.00s) @@ -8691,7 +8728,7 @@ --- PASS: TestShortHumanDurationBoundaries/17519h59m59.999s (0.00s) --- PASS: TestShortHumanDurationBoundaries/17520h0m0s (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/duration 0.172s +ok k8s.io/apimachinery/pkg/util/duration 0.032s === RUN TestEmptyAggregate --- PASS: TestEmptyAggregate (0.00s) === RUN TestAggregateWithNil @@ -8737,7 +8774,7 @@ === RUN TestErrConfigurationInvalidWithErrorsIsShortCircuitsOnFirstMatch --- PASS: TestErrConfigurationInvalidWithErrorsIsShortCircuitsOnFirstMatch (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/errors 0.168s +ok k8s.io/apimachinery/pkg/util/errors 0.016s === RUN TestRead --- PASS: TestRead (0.00s) === RUN TestReadLarge @@ -8751,21 +8788,21 @@ === RUN TestJSONFrameReaderShortBufferNoUnderlyingArrayReuse --- PASS: TestJSONFrameReaderShortBufferNoUnderlyingArrayReuse (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/framer 0.159s +ok k8s.io/apimachinery/pkg/util/framer 0.015s === RUN TestHandshake --- PASS: TestHandshake (0.00s) === RUN TestIsUpgradeFailureError -=== RUN TestIsUpgradeFailureError/nil_error_should_return_false === RUN TestIsUpgradeFailureError/Non-upgrade_error_should_return_false === RUN TestIsUpgradeFailureError/UpgradeFailure_error_should_return_true === RUN TestIsUpgradeFailureError/Wrapped_Non-UpgradeFailure_error_should_return_false === RUN TestIsUpgradeFailureError/Wrapped_UpgradeFailure_error_should_return_true +=== RUN TestIsUpgradeFailureError/nil_error_should_return_false --- PASS: TestIsUpgradeFailureError (0.00s) - --- PASS: TestIsUpgradeFailureError/nil_error_should_return_false (0.00s) --- PASS: TestIsUpgradeFailureError/Non-upgrade_error_should_return_false (0.00s) --- PASS: TestIsUpgradeFailureError/UpgradeFailure_error_should_return_true (0.00s) --- PASS: TestIsUpgradeFailureError/Wrapped_Non-UpgradeFailure_error_should_return_false (0.00s) --- PASS: TestIsUpgradeFailureError/Wrapped_UpgradeFailure_error_should_return_true (0.00s) + --- PASS: TestIsUpgradeFailureError/nil_error_should_return_false (0.00s) === RUN TestIsHTTPSProxyError === RUN TestIsHTTPSProxyError/nil_error_should_return_false === RUN TestIsHTTPSProxyError/Not_HTTPS_proxy_error_should_return_false @@ -8775,7 +8812,7 @@ --- PASS: TestIsHTTPSProxyError/Not_HTTPS_proxy_error_should_return_false (0.00s) --- PASS: TestIsHTTPSProxyError/HTTPS_proxy_error_should_return_true (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/httpstream 0.156s +ok k8s.io/apimachinery/pkg/util/httpstream 0.027s === RUN TestConnectionCloseIsImmediateThroughAProxy --- PASS: TestConnectionCloseIsImmediateThroughAProxy (0.01s) === RUN TestConnectionPings @@ -8783,185 +8820,187 @@ === RUN TestConnectionRemoveStreams --- PASS: TestConnectionRemoveStreams (0.00s) === RUN TestRoundTripAndNewConnection -=== RUN TestRoundTripAndNewConnection/no_headers - roundtripper_test.go:318: Server URL: http://127.0.0.1:35863 -=== RUN TestRoundTripAndNewConnection/no_connection_header - roundtripper_test.go:318: Server URL: http://127.0.0.1:33979 -=== RUN TestRoundTripAndNewConnection/https_(valid_hostname_+_RootCAs) - roundtripper_test.go:318: Server URL: https://127.0.0.1:33795 -=== RUN TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_InsecureSkipVerify)_->_http - roundtripper_test.go:318: Server URL: http://127.0.0.1:45727 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:38535 - http.go:87: Proxy Request: CONNECT 127.0.0.1:45727 HTTP/1.1 - Host: 127.0.0.1:45727 - User-Agent: Go-http-client/1.1 - - http.go:142: Server write close, host=127.0.0.1:45727 - http.go:137: Server read close, host=127.0.0.1:45727 - http.go:145: Done handling CONNECT request, host=127.0.0.1:45727 -=== RUN TestRoundTripAndNewConnection/proxied_https_(valid_hostname_+_RootCAs)_->_http - roundtripper_test.go:318: Server URL: http://127.0.0.1:42485 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:45557 - http.go:87: Proxy Request: CONNECT 127.0.0.1:42485 HTTP/1.1 - Host: 127.0.0.1:42485 +=== RUN TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_hostname_verification)_->_https_(invalid_hostname) + roundtripper_test.go:318: Server URL: https://127.0.0.1:38945 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:43913 +2026/04/04 05:52:45 http: TLS handshake error from 127.0.0.1:42352: read tcp 127.0.0.1:43913->127.0.0.1:42352: use of closed network connection +=== RUN TestRoundTripAndNewConnection/proxied_valid_https,_proxy_auth_with_chars_that_percent_escape_->_valid_https + roundtripper_test.go:318: Server URL: https://127.0.0.1:37213 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:38041 + http.go:87: Proxy Request: CONNECT 127.0.0.1:37213 HTTP/1.1 + Host: 127.0.0.1:37213 + Proxy-Authorization: Basic cHJveHkgdXNlcjpwcm94eXBhc3N3ZCU= User-Agent: Go-http-client/1.1 - http.go:142: Server write close, host=127.0.0.1:42485 - http.go:137: Server read close, host=127.0.0.1:42485 - http.go:145: Done handling CONNECT request, host=127.0.0.1:42485 -=== RUN TestRoundTripAndNewConnection/proxied_https_with_auth_(invalid_hostname_+_InsecureSkipVerify)_->_https_(invalid_hostname) - roundtripper_test.go:318: Server URL: https://127.0.0.1:33949 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:37981 - http.go:87: Proxy Request: CONNECT 127.0.0.1:33949 HTTP/1.1 - Host: 127.0.0.1:33949 - Proxy-Authorization: Basic cHJveHl1c2VyOnByb3h5cGFzc3dk + http.go:142: Server write close, host=127.0.0.1:37213 + http.go:137: Server read close, host=127.0.0.1:37213 + http.go:145: Done handling CONNECT request, host=127.0.0.1:37213 +=== RUN TestRoundTripAndNewConnection/no_upgrade_header + roundtripper_test.go:318: Server URL: http://127.0.0.1:37031 +=== RUN TestRoundTripAndNewConnection/https_(valid_hostname_+_RootCAs) + roundtripper_test.go:318: Server URL: https://127.0.0.1:34253 +=== RUN TestRoundTripAndNewConnection/proxied_https_(valid_hostname_+_RootCAs)_->_https_(valid_hostname_+_RootCAs) + roundtripper_test.go:318: Server URL: https://127.0.0.1:38721 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:42383 + http.go:87: Proxy Request: CONNECT 127.0.0.1:38721 HTTP/1.1 + Host: 127.0.0.1:38721 User-Agent: Go-http-client/1.1 - http.go:142: Server write close, host=127.0.0.1:33949 - http.go:137: Server read close, host=127.0.0.1:33949 - http.go:145: Done handling CONNECT request, host=127.0.0.1:33949 -=== RUN TestRoundTripAndNewConnection/no_upgrade_header - roundtripper_test.go:318: Server URL: http://127.0.0.1:42653 + http.go:142: Server write close, host=127.0.0.1:38721 + http.go:137: Server read close, host=127.0.0.1:38721 + http.go:145: Done handling CONNECT request, host=127.0.0.1:38721 +=== RUN TestRoundTripAndNewConnection/no_switching_protocol_status_code + roundtripper_test.go:318: Server URL: http://127.0.0.1:35841 === RUN TestRoundTripAndNewConnection/http - roundtripper_test.go:318: Server URL: http://127.0.0.1:43495 -=== RUN TestRoundTripAndNewConnection/https_(invalid_hostname_+_InsecureSkipVerify) - roundtripper_test.go:318: Server URL: https://127.0.0.1:41791 -=== RUN TestRoundTripAndNewConnection/https_(invalid_hostname_+_hostname_verification) - roundtripper_test.go:318: Server URL: https://127.0.0.1:38015 -2025/03/01 23:23:28 http: TLS handshake error from 127.0.0.1:54822: read tcp 127.0.0.1:38015->127.0.0.1:54822: use of closed network connection + roundtripper_test.go:318: Server URL: http://127.0.0.1:34209 === RUN TestRoundTripAndNewConnection/proxied_https_with_auth_(invalid_hostname_+_InsecureSkipVerify)_->_http - roundtripper_test.go:318: Server URL: http://127.0.0.1:34943 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:46129 - http.go:87: Proxy Request: CONNECT 127.0.0.1:34943 HTTP/1.1 - Host: 127.0.0.1:34943 + roundtripper_test.go:318: Server URL: http://127.0.0.1:35303 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:36583 + http.go:87: Proxy Request: CONNECT 127.0.0.1:35303 HTTP/1.1 + Host: 127.0.0.1:35303 Proxy-Authorization: Basic cHJveHl1c2VyOnByb3h5cGFzc3dk User-Agent: Go-http-client/1.1 - http.go:142: Server write close, host=127.0.0.1:34943 - http.go:137: Server read close, host=127.0.0.1:34943 - http.go:145: Done handling CONNECT request, host=127.0.0.1:34943 -=== RUN TestRoundTripAndNewConnection/no_switching_protocol_status_code - roundtripper_test.go:318: Server URL: http://127.0.0.1:36375 -=== RUN TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_hostname_verification)_->_http - roundtripper_test.go:318: Server URL: http://127.0.0.1:40841 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:41095 -2025/03/01 23:23:28 http: TLS handshake error from 127.0.0.1:44182: read tcp 127.0.0.1:41095->127.0.0.1:44182: use of closed network connection -=== RUN TestRoundTripAndNewConnection/proxied_https_with_auth_(valid_hostname_+_RootCAs)_->_http - roundtripper_test.go:318: Server URL: http://127.0.0.1:42415 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:36189 - http.go:87: Proxy Request: CONNECT 127.0.0.1:42415 HTTP/1.1 - Host: 127.0.0.1:42415 - Proxy-Authorization: Basic cHJveHl1c2VyOnByb3h5cGFzc3dk + http.go:137: Server read close, host=127.0.0.1:35303 + http.go:142: Server write close, host=127.0.0.1:35303 + http.go:145: Done handling CONNECT request, host=127.0.0.1:35303 +=== RUN TestRoundTripAndNewConnection/proxied_https_(valid_hostname_+_RootCAs)_->_http + roundtripper_test.go:318: Server URL: http://127.0.0.1:36449 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:36263 + http.go:87: Proxy Request: CONNECT 127.0.0.1:36449 HTTP/1.1 + Host: 127.0.0.1:36449 User-Agent: Go-http-client/1.1 - http.go:142: Server write close, host=127.0.0.1:42415 - http.go:137: Server read close, host=127.0.0.1:42415 - http.go:145: Done handling CONNECT request, host=127.0.0.1:42415 + http.go:142: Server write close, host=127.0.0.1:36449 + http.go:137: Server read close, host=127.0.0.1:36449 + http.go:145: Done handling CONNECT request, host=127.0.0.1:36449 === RUN TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_InsecureSkipVerify)_->_https_(invalid_hostname) - roundtripper_test.go:318: Server URL: https://127.0.0.1:41621 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:32775 - http.go:87: Proxy Request: CONNECT 127.0.0.1:41621 HTTP/1.1 - Host: 127.0.0.1:41621 + roundtripper_test.go:318: Server URL: https://127.0.0.1:37885 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:35259 + http.go:87: Proxy Request: CONNECT 127.0.0.1:37885 HTTP/1.1 + Host: 127.0.0.1:37885 User-Agent: Go-http-client/1.1 - http.go:142: Server write close, host=127.0.0.1:41621 - http.go:137: Server read close, host=127.0.0.1:41621 - http.go:145: Done handling CONNECT request, host=127.0.0.1:41621 -=== RUN TestRoundTripAndNewConnection/proxied_https_(valid_hostname_+_RootCAs)_->_https_(valid_hostname_+_RootCAs) - roundtripper_test.go:318: Server URL: https://127.0.0.1:42193 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:43605 - http.go:87: Proxy Request: CONNECT 127.0.0.1:42193 HTTP/1.1 - Host: 127.0.0.1:42193 + http.go:142: Server write close, host=127.0.0.1:37885 + http.go:137: Server read close, host=127.0.0.1:37885 + http.go:145: Done handling CONNECT request, host=127.0.0.1:37885 +=== RUN TestRoundTripAndNewConnection/proxied_https_with_auth_(valid_hostname_+_RootCAs)_->_https_(valid_hostname_+_RootCAs) + roundtripper_test.go:318: Server URL: https://127.0.0.1:40919 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:35201 + http.go:87: Proxy Request: CONNECT 127.0.0.1:40919 HTTP/1.1 + Host: 127.0.0.1:40919 + Proxy-Authorization: Basic cHJveHl1c2VyOnByb3h5cGFzc3dk User-Agent: Go-http-client/1.1 - http.go:137: Server read close, host=127.0.0.1:42193 - http.go:142: Server write close, host=127.0.0.1:42193 - http.go:145: Done handling CONNECT request, host=127.0.0.1:42193 -=== RUN TestRoundTripAndNewConnection/proxied_valid_https,_proxy_auth_with_chars_that_percent_escape_->_valid_https - roundtripper_test.go:318: Server URL: https://127.0.0.1:40889 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:39837 - http.go:87: Proxy Request: CONNECT 127.0.0.1:40889 HTTP/1.1 - Host: 127.0.0.1:40889 - Proxy-Authorization: Basic cHJveHkgdXNlcjpwcm94eXBhc3N3ZCU= + http.go:137: Server read close, host=127.0.0.1:40919 + http.go:142: Server write close, host=127.0.0.1:40919 + http.go:145: Done handling CONNECT request, host=127.0.0.1:40919 +=== RUN TestRoundTripAndNewConnection/no_headers + roundtripper_test.go:318: Server URL: http://127.0.0.1:38751 +=== RUN TestRoundTripAndNewConnection/https_(invalid_hostname_+_InsecureSkipVerify) + roundtripper_test.go:318: Server URL: https://127.0.0.1:33527 +=== RUN TestRoundTripAndNewConnection/proxied_https_with_auth_(invalid_hostname_+_InsecureSkipVerify)_->_https_(invalid_hostname) + roundtripper_test.go:318: Server URL: https://127.0.0.1:33409 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:43973 + http.go:87: Proxy Request: CONNECT 127.0.0.1:33409 HTTP/1.1 + Host: 127.0.0.1:33409 + Proxy-Authorization: Basic cHJveHl1c2VyOnByb3h5cGFzc3dk User-Agent: Go-http-client/1.1 - http.go:142: Server write close, host=127.0.0.1:40889 - http.go:137: Server read close, host=127.0.0.1:40889 - http.go:145: Done handling CONNECT request, host=127.0.0.1:40889 + http.go:137: Server read close, host=127.0.0.1:33409 + http.go:142: Server write close, host=127.0.0.1:33409 + http.go:145: Done handling CONNECT request, host=127.0.0.1:33409 +=== RUN TestRoundTripAndNewConnection/no_connection_header + roundtripper_test.go:318: Server URL: http://127.0.0.1:38165 +=== RUN TestRoundTripAndNewConnection/https_(invalid_hostname_+_hostname_verification) + roundtripper_test.go:318: Server URL: https://127.0.0.1:38649 +2026/04/04 05:52:45 http: TLS handshake error from 127.0.0.1:57730: read tcp 127.0.0.1:38649->127.0.0.1:57730: use of closed network connection === RUN TestRoundTripAndNewConnection/proxied_http->http - roundtripper_test.go:318: Server URL: http://127.0.0.1:45171 - roundtripper_test.go:352: Proxy URL: http://127.0.0.1:42413 - http.go:87: Proxy Request: CONNECT 127.0.0.1:45171 HTTP/1.1 - Host: 127.0.0.1:45171 + roundtripper_test.go:318: Server URL: http://127.0.0.1:43507 + roundtripper_test.go:352: Proxy URL: http://127.0.0.1:38943 + http.go:87: Proxy Request: CONNECT 127.0.0.1:43507 HTTP/1.1 + Host: 127.0.0.1:43507 User-Agent: Go-http-client/1.1 - http.go:142: Server write close, host=127.0.0.1:45171 - http.go:137: Server read close, host=127.0.0.1:45171 - http.go:145: Done handling CONNECT request, host=127.0.0.1:45171 -=== RUN TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_hostname_verification)_->_https_(invalid_hostname) - roundtripper_test.go:318: Server URL: https://127.0.0.1:42909 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:35963 -2025/03/01 23:23:28 http: TLS handshake error from 127.0.0.1:50230: read tcp 127.0.0.1:35963->127.0.0.1:50230: use of closed network connection -=== RUN TestRoundTripAndNewConnection/proxied_https_with_auth_(valid_hostname_+_RootCAs)_->_https_(valid_hostname_+_RootCAs) - roundtripper_test.go:318: Server URL: https://127.0.0.1:36893 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:33645 - http.go:87: Proxy Request: CONNECT 127.0.0.1:36893 HTTP/1.1 - Host: 127.0.0.1:36893 + http.go:142: Server write close, host=127.0.0.1:43507 + http.go:137: Server read close, host=127.0.0.1:43507 + http.go:145: Done handling CONNECT request, host=127.0.0.1:43507 +=== RUN TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_InsecureSkipVerify)_->_http + roundtripper_test.go:318: Server URL: http://127.0.0.1:43223 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:36865 + http.go:87: Proxy Request: CONNECT 127.0.0.1:43223 HTTP/1.1 + Host: 127.0.0.1:43223 + User-Agent: Go-http-client/1.1 + + http.go:142: Server write close, host=127.0.0.1:43223 + http.go:137: Server read close, host=127.0.0.1:43223 + http.go:145: Done handling CONNECT request, host=127.0.0.1:43223 +=== RUN TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_hostname_verification)_->_http + roundtripper_test.go:318: Server URL: http://127.0.0.1:43007 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:43943 +2026/04/04 05:52:45 http: TLS handshake error from 127.0.0.1:58214: read tcp 127.0.0.1:43943->127.0.0.1:58214: use of closed network connection +=== RUN TestRoundTripAndNewConnection/proxied_https_with_auth_(valid_hostname_+_RootCAs)_->_http + roundtripper_test.go:318: Server URL: http://127.0.0.1:41753 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:40419 + http.go:87: Proxy Request: CONNECT 127.0.0.1:41753 HTTP/1.1 + Host: 127.0.0.1:41753 Proxy-Authorization: Basic cHJveHl1c2VyOnByb3h5cGFzc3dk User-Agent: Go-http-client/1.1 - http.go:142: Server write close, host=127.0.0.1:36893 - http.go:137: Server read close, host=127.0.0.1:36893 - http.go:145: Done handling CONNECT request, host=127.0.0.1:36893 ---- PASS: TestRoundTripAndNewConnection (0.77s) + http.go:142: Server write close, host=127.0.0.1:41753 + http.go:137: Server read close, host=127.0.0.1:41753 + http.go:145: Done handling CONNECT request, host=127.0.0.1:41753 +--- PASS: TestRoundTripAndNewConnection (0.30s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_hostname_verification)_->_https_(invalid_hostname) (0.01s) + --- PASS: TestRoundTripAndNewConnection/proxied_valid_https,_proxy_auth_with_chars_that_percent_escape_->_valid_https (0.05s) + --- PASS: TestRoundTripAndNewConnection/no_upgrade_header (0.00s) + --- PASS: TestRoundTripAndNewConnection/https_(valid_hostname_+_RootCAs) (0.02s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_(valid_hostname_+_RootCAs)_->_https_(valid_hostname_+_RootCAs) (0.03s) + --- PASS: TestRoundTripAndNewConnection/no_switching_protocol_status_code (0.00s) + --- PASS: TestRoundTripAndNewConnection/http (0.02s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_with_auth_(invalid_hostname_+_InsecureSkipVerify)_->_http (0.01s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_(valid_hostname_+_RootCAs)_->_http (0.02s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_InsecureSkipVerify)_->_https_(invalid_hostname) (0.02s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_with_auth_(valid_hostname_+_RootCAs)_->_https_(valid_hostname_+_RootCAs) (0.02s) --- PASS: TestRoundTripAndNewConnection/no_headers (0.00s) + --- PASS: TestRoundTripAndNewConnection/https_(invalid_hostname_+_InsecureSkipVerify) (0.02s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_with_auth_(invalid_hostname_+_InsecureSkipVerify)_->_https_(invalid_hostname) (0.02s) --- PASS: TestRoundTripAndNewConnection/no_connection_header (0.00s) - --- PASS: TestRoundTripAndNewConnection/https_(valid_hostname_+_RootCAs) (0.05s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_InsecureSkipVerify)_->_http (0.06s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_(valid_hostname_+_RootCAs)_->_http (0.06s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_with_auth_(invalid_hostname_+_InsecureSkipVerify)_->_https_(invalid_hostname) (0.07s) - --- PASS: TestRoundTripAndNewConnection/no_upgrade_header (0.00s) - --- PASS: TestRoundTripAndNewConnection/http (0.04s) - --- PASS: TestRoundTripAndNewConnection/https_(invalid_hostname_+_InsecureSkipVerify) (0.01s) - --- PASS: TestRoundTripAndNewConnection/https_(invalid_hostname_+_hostname_verification) (0.02s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_with_auth_(invalid_hostname_+_InsecureSkipVerify)_->_http (0.05s) - --- PASS: TestRoundTripAndNewConnection/no_switching_protocol_status_code (0.01s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_hostname_verification)_->_http (0.02s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_with_auth_(valid_hostname_+_RootCAs)_->_http (0.05s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_InsecureSkipVerify)_->_https_(invalid_hostname) (0.06s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_(valid_hostname_+_RootCAs)_->_https_(valid_hostname_+_RootCAs) (0.09s) - --- PASS: TestRoundTripAndNewConnection/proxied_valid_https,_proxy_auth_with_chars_that_percent_escape_->_valid_https (0.07s) - --- PASS: TestRoundTripAndNewConnection/proxied_http->http (0.03s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_hostname_verification)_->_https_(invalid_hostname) (0.02s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_with_auth_(valid_hostname_+_RootCAs)_->_https_(valid_hostname_+_RootCAs) (0.06s) + --- PASS: TestRoundTripAndNewConnection/https_(invalid_hostname_+_hostname_verification) (0.01s) + --- PASS: TestRoundTripAndNewConnection/proxied_http->http (0.01s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_InsecureSkipVerify)_->_http (0.02s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_hostname_verification)_->_http (0.01s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_with_auth_(valid_hostname_+_RootCAs)_->_http (0.01s) === RUN TestRoundTripConstuctor +=== RUN TestRoundTripConstuctor/Basic_TLSConfig;_no_error +=== RUN TestRoundTripConstuctor/Basic_TLSConfig_and_Proxier:_no_error === RUN TestRoundTripConstuctor/TLSConfig_with_UpgradeTransport:_error === RUN TestRoundTripConstuctor/Proxier_with_UpgradeTransport:_error === RUN TestRoundTripConstuctor/Only_UpgradeTransport:_no_error -=== RUN TestRoundTripConstuctor/Basic_TLSConfig;_no_error -=== RUN TestRoundTripConstuctor/Basic_TLSConfig_and_Proxier:_no_error --- PASS: TestRoundTripConstuctor (0.00s) + --- PASS: TestRoundTripConstuctor/Basic_TLSConfig;_no_error (0.00s) + --- PASS: TestRoundTripConstuctor/Basic_TLSConfig_and_Proxier:_no_error (0.00s) --- PASS: TestRoundTripConstuctor/TLSConfig_with_UpgradeTransport:_error (0.00s) --- PASS: TestRoundTripConstuctor/Proxier_with_UpgradeTransport:_error (0.00s) --- PASS: TestRoundTripConstuctor/Only_UpgradeTransport:_no_error (0.00s) - --- PASS: TestRoundTripConstuctor/Basic_TLSConfig;_no_error (0.00s) - --- PASS: TestRoundTripConstuctor/Basic_TLSConfig_and_Proxier:_no_error (0.00s) === RUN TestRoundTripSocks5AndNewConnection +=== RUN TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(invalid_hostname_+_InsecureSkipVerify) === RUN TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(invalid_hostname_+_hostname_verification) -2025/03/01 23:23:28 http: TLS handshake error from 127.0.0.1:58628: read tcp 127.0.0.1:44037->127.0.0.1:58628: use of closed network connection +2026/04/04 05:52:45 [ERR] socks: Failed to handle request: writeto tcp 127.0.0.1:54484->127.0.0.1:40693: readfrom tcp 127.0.0.1:40941->127.0.0.1:44136: splice: connection reset by peer +2026/04/04 05:52:45 [ERR] socks: Failed to handle request: writeto tcp 127.0.0.1:57796->127.0.0.1:36829: readfrom tcp 127.0.0.1:38215->127.0.0.1:40232: splice: connection reset by peer +2026/04/04 05:52:45 http: TLS handshake error from 127.0.0.1:57796: read tcp 127.0.0.1:36829->127.0.0.1:57796: use of closed network connection === RUN TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(valid_hostname_+_RootCAs) === RUN TestRoundTripSocks5AndNewConnection/proxied_without_auth_->_http === RUN TestRoundTripSocks5AndNewConnection/proxied_with_invalid_auth_->_http -2025/03/01 23:23:28 [ERR] socks: Failed to authenticate: User authentication failed +2026/04/04 05:52:45 [ERR] socks: Failed to authenticate: User authentication failed === RUN TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_http -=== RUN TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(invalid_hostname_+_InsecureSkipVerify) ---- PASS: TestRoundTripSocks5AndNewConnection (0.18s) - --- PASS: TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(invalid_hostname_+_hostname_verification) (0.04s) - --- PASS: TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(valid_hostname_+_RootCAs) (0.04s) - --- PASS: TestRoundTripSocks5AndNewConnection/proxied_without_auth_->_http (0.03s) - --- PASS: TestRoundTripSocks5AndNewConnection/proxied_with_invalid_auth_->_http (0.01s) - --- PASS: TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_http (0.00s) - --- PASS: TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(invalid_hostname_+_InsecureSkipVerify) (0.07s) +--- PASS: TestRoundTripSocks5AndNewConnection (0.06s) + --- PASS: TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(invalid_hostname_+_InsecureSkipVerify) (0.02s) + --- PASS: TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(invalid_hostname_+_hostname_verification) (0.01s) + --- PASS: TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(valid_hostname_+_RootCAs) (0.01s) + --- PASS: TestRoundTripSocks5AndNewConnection/proxied_without_auth_->_http (0.01s) + --- PASS: TestRoundTripSocks5AndNewConnection/proxied_with_invalid_auth_->_http (0.00s) + --- PASS: TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_http (0.01s) === RUN TestRoundTripPassesContextToDialer === RUN TestRoundTripPassesContextToDialer/http://127.0.0.1:1233/ === RUN TestRoundTripPassesContextToDialer/https://127.0.0.1:1233/ @@ -8969,13 +9008,13 @@ --- PASS: TestRoundTripPassesContextToDialer/http://127.0.0.1:1233/ (0.00s) --- PASS: TestRoundTripPassesContextToDialer/https://127.0.0.1:1233/ (0.00s) === RUN TestUpgradeResponse ---- PASS: TestUpgradeResponse (0.01s) +--- PASS: TestUpgradeResponse (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/httpstream/spdy 1.052s +ok k8s.io/apimachinery/pkg/util/httpstream/spdy 0.442s === RUN TestRawConn --- PASS: TestRawConn (0.00s) === RUN TestBase64Conn ---- PASS: TestBase64Conn (0.01s) +--- PASS: TestBase64Conn (0.00s) === RUN TestVersionedConn --- PASS: TestVersionedConn (0.01s) === RUN TestIsWebSocketRequestWithStreamCloseProtocol @@ -8983,7 +9022,7 @@ === RUN TestProtocolSupportsStreamClose --- PASS: TestProtocolSupportsStreamClose (0.00s) === RUN TestStream ---- PASS: TestStream (0.01s) +--- PASS: TestStream (0.00s) === RUN TestStreamPing --- PASS: TestStreamPing (0.00s) === RUN TestStreamBase64 @@ -8991,15 +9030,15 @@ === RUN TestStreamVersionedBase64 --- PASS: TestStreamVersionedBase64 (0.00s) === RUN TestStreamVersionedCopy ---- PASS: TestStreamVersionedCopy (0.03s) +--- PASS: TestStreamVersionedCopy (0.01s) === RUN TestStreamError ---- PASS: TestStreamError (0.01s) +--- PASS: TestStreamError (0.00s) === RUN TestStreamSurvivesPanic --- PASS: TestStreamSurvivesPanic (0.00s) === RUN TestStreamClosedDuringRead ---- PASS: TestStreamClosedDuringRead (0.06s) +--- PASS: TestStreamClosedDuringRead (0.02s) PASS -ok k8s.io/apimachinery/pkg/util/httpstream/wsstream 0.174s +ok k8s.io/apimachinery/pkg/util/httpstream/wsstream 0.068s === RUN TestFromInt --- PASS: TestFromInt (0.00s) === RUN TestFromInt32 @@ -9041,7 +9080,7 @@ intstr_test.go:251: test case 5 intstr_test.go:251: test case 6 intstr_test.go:251: test case 7 ---- PASS: TestGetIntFromIntOrPercent (0.00s) +--- PASS: TestGetIntFromIntOrPercent (0.01s) === RUN TestGetValueFromIntOrPercentNil --- PASS: TestGetValueFromIntOrPercentNil (0.00s) === RUN TestParse @@ -9115,7 +9154,7 @@ === RUN TestUnmarshalCBOR/{Type:0,IntVal:-65536,StrVal:""} === RUN TestUnmarshalCBOR/{Type:0,IntVal:-65537,StrVal:""} === RUN TestUnmarshalCBOR/{Type:0,IntVal:-2147483648,StrVal:""} ---- PASS: TestUnmarshalCBOR (0.01s) +--- PASS: TestUnmarshalCBOR (0.00s) --- PASS: TestUnmarshalCBOR/{Type:0,IntVal:0,StrVal:""} (0.00s) --- PASS: TestUnmarshalCBOR/{Type:1,IntVal:0,StrVal:""} (0.00s) --- PASS: TestUnmarshalCBOR/{Type:1,IntVal:0,StrVal:"abc"} (0.00s) @@ -9136,9 +9175,9 @@ --- PASS: TestUnmarshalCBOR/{Type:0,IntVal:-65537,StrVal:""} (0.00s) --- PASS: TestUnmarshalCBOR/{Type:0,IntVal:-2147483648,StrVal:""} (0.00s) === RUN TestIntOrStringRoundtripCBOR ---- PASS: TestIntOrStringRoundtripCBOR (0.00s) +--- PASS: TestIntOrStringRoundtripCBOR (0.01s) PASS -ok k8s.io/apimachinery/pkg/util/intstr 0.052s +ok k8s.io/apimachinery/pkg/util/intstr 0.043s === RUN TestEvaluateTypes === RUN TestEvaluateTypes/0_map === RUN TestEvaluateTypes/0_slice @@ -9245,7 +9284,7 @@ === RUN TestEvaluateTypes/34_map === RUN TestEvaluateTypes/34_slice === RUN TestEvaluateTypes/34_raw ---- PASS: TestEvaluateTypes (0.02s) +--- PASS: TestEvaluateTypes (0.01s) --- PASS: TestEvaluateTypes/0_map (0.00s) --- PASS: TestEvaluateTypes/0_slice (0.00s) --- PASS: TestEvaluateTypes/0_raw (0.00s) @@ -9342,7 +9381,7 @@ --- PASS: TestEvaluateTypes/31_map (0.00s) --- PASS: TestEvaluateTypes/31_slice (0.00s) --- PASS: TestEvaluateTypes/31_raw (0.00s) - --- PASS: TestEvaluateTypes/32_map (0.01s) + --- PASS: TestEvaluateTypes/32_map (0.00s) --- PASS: TestEvaluateTypes/32_slice (0.00s) --- PASS: TestEvaluateTypes/32_raw (0.00s) --- PASS: TestEvaluateTypes/33_map (0.00s) @@ -9357,14 +9396,14 @@ json_test.go:416: json: Unmarshal(nil *map[string]interface {}) --- PASS: TestUnmarshalNil (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/json 0.076s +ok k8s.io/apimachinery/pkg/util/json 0.021s === RUN TestKeepOrDeleteNullInObj --- PASS: TestKeepOrDeleteNullInObj (0.00s) === RUN TestCreateThreeWayJSONMergePatch patch_test.go:682: This test breaks build even though the results are the same ---- SKIP: TestCreateThreeWayJSONMergePatch (0.01s) +--- SKIP: TestCreateThreeWayJSONMergePatch (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/jsonmergepatch 0.044s +ok k8s.io/apimachinery/pkg/util/jsonmergepatch 0.018s ? k8s.io/apimachinery/pkg/util/managedfields [no test files] ? k8s.io/apimachinery/pkg/util/managedfields/internal [no test files] ? k8s.io/apimachinery/pkg/util/managedfields/internal/testing [no test files] @@ -9372,7 +9411,7 @@ === RUN TestHasConflicts --- PASS: TestHasConflicts (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/mergepatch 0.036s +ok k8s.io/apimachinery/pkg/util/mergepatch 0.013s === RUN TestGetNameFromCallsite === RUN TestGetNameFromCallsite/simple === RUN TestGetNameFromCallsite/ignore-package @@ -9384,7 +9423,7 @@ --- PASS: TestGetNameFromCallsite/ignore-file (0.00s) --- PASS: TestGetNameFromCallsite/ignore-multiple (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/naming 0.043s +ok k8s.io/apimachinery/pkg/util/naming 0.016s === RUN TestGetClientIP --- PASS: TestGetClientIP (0.00s) === RUN TestAppendForwardedForHeader @@ -9584,10 +9623,10 @@ --- PASS: TestIsProbableEOF/with_url_error (0.00s) --- PASS: TestIsProbableEOF/with_unrecognized_error (0.00s) === RUN TestReadIdleTimeoutSeconds -W0301 23:23:34.141774 4113583 http.go:151] Illegal HTTP2_READ_IDLE_TIMEOUT_SECONDS("illegal value"): strconv.Atoi: parsing "illegal value": invalid syntax. Default value 30 is used +W0404 05:52:46.490027 834572 http.go:151] Illegal HTTP2_READ_IDLE_TIMEOUT_SECONDS("illegal value"): strconv.Atoi: parsing "illegal value": invalid syntax. Default value 30 is used --- PASS: TestReadIdleTimeoutSeconds (0.00s) === RUN TestPingTimeoutSeconds -W0301 23:23:34.142602 4113583 http.go:165] Illegal HTTP2_PING_TIMEOUT_SECONDS("illegal value"): strconv.Atoi: parsing "illegal value": invalid syntax. Default value 15 is used +W0404 05:52:46.490268 834572 http.go:165] Illegal HTTP2_PING_TIMEOUT_SECONDS("illegal value"): strconv.Atoi: parsing "illegal value": invalid syntax. Default value 15 is used --- PASS: TestPingTimeoutSeconds (0.00s) === RUN TestGetIPv4Routes --- PASS: TestGetIPv4Routes (0.00s) @@ -9606,7 +9645,7 @@ === RUN TestGetIPFromLoopbackInterface --- PASS: TestGetIPFromLoopbackInterface (0.00s) === RUN TestChooseHostInterfaceFromRoute ---- PASS: TestChooseHostInterfaceFromRoute (0.01s) +--- PASS: TestChooseHostInterfaceFromRoute (0.00s) === RUN TestMemberOf --- PASS: TestMemberOf (0.00s) === RUN TestGetIPFromHostInterfaces @@ -9618,7 +9657,7 @@ === RUN TestGetAllDefaultRoutesFailNoV4RouteFile --- PASS: TestGetAllDefaultRoutesFailNoV4RouteFile (0.00s) === RUN TestGetAllDefaultRoutes ---- PASS: TestGetAllDefaultRoutes (0.00s) +--- PASS: TestGetAllDefaultRoutes (0.01s) === RUN TestPortRange --- PASS: TestPortRange (0.00s) === RUN TestSplitSchemeNamePort @@ -9628,57 +9667,51 @@ === RUN TestIsConnectionRefused --- PASS: TestIsConnectionRefused (0.00s) === RUN TestIsConnectionReset ---- PASS: TestIsConnectionReset (2.05s) +--- PASS: TestIsConnectionReset (2.02s) PASS -ok k8s.io/apimachinery/pkg/util/net 2.124s +ok k8s.io/apimachinery/pkg/util/net 2.058s ? k8s.io/apimachinery/pkg/util/net/testing [no test files] ? k8s.io/apimachinery/pkg/util/portforward [no test files] === RUN TestDialURL -2025/03/01 23:23:34 http: TLS handshake error from 127.0.0.1:39866: remote error: tls: bad certificate -2025/03/01 23:23:34 http: TLS handshake error from 127.0.0.1:48192: read tcp 127.0.0.1:46659->127.0.0.1:48192: use of closed network connection -2025/03/01 23:23:34 http: TLS handshake error from 127.0.0.1:45776: read tcp 127.0.0.1:43397->127.0.0.1:45776: use of closed network connection -2025/03/01 23:23:34 http: TLS handshake error from 127.0.0.1:57690: read tcp 127.0.0.1:42993->127.0.0.1:57690: use of closed network connection -2025/03/01 23:23:34 http: TLS handshake error from 127.0.0.1:35432: read tcp 127.0.0.1:37281->127.0.0.1:35432: use of closed network connection -2025/03/01 23:23:34 http: TLS handshake error from 127.0.0.1:42428: read tcp 127.0.0.1:44027->127.0.0.1:42428: use of closed network connection -2025/03/01 23:23:34 http: TLS handshake error from 127.0.0.1:60838: read tcp 127.0.0.1:33437->127.0.0.1:60838: use of closed network connection -2025/03/01 23:23:34 http: TLS handshake error from 127.0.0.1:60990: read tcp 127.0.0.1:34325->127.0.0.1:60990: use of closed network connection -2025/03/01 23:23:34 http: TLS handshake error from 127.0.0.1:49674: read tcp 127.0.0.1:33711->127.0.0.1:49674: use of closed network connection -2025/03/01 23:23:34 http: TLS handshake error from 127.0.0.1:50968: read tcp 127.0.0.1:39259->127.0.0.1:50968: use of closed network connection -2025/03/01 23:23:34 http: TLS handshake error from 127.0.0.1:59280: read tcp 127.0.0.1:35823->127.0.0.1:59280: use of closed network connection -2025/03/01 23:23:34 http: TLS handshake error from 127.0.0.1:55852: read tcp 127.0.0.1:44909->127.0.0.1:55852: use of closed network connection -2025/03/01 23:23:34 http: TLS handshake error from 127.0.0.1:53652: read tcp 127.0.0.1:37809->127.0.0.1:53652: use of closed network connection ---- PASS: TestDialURL (0.20s) +2026/04/04 05:52:46 http: TLS handshake error from 127.0.0.1:39436: read tcp 127.0.0.1:34997->127.0.0.1:39436: use of closed network connection +2026/04/04 05:52:46 http: TLS handshake error from 127.0.0.1:46416: read tcp 127.0.0.1:34565->127.0.0.1:46416: use of closed network connection +2026/04/04 05:52:46 http: TLS handshake error from 127.0.0.1:34108: remote error: tls: bad certificate +2026/04/04 05:52:46 http: TLS handshake error from 127.0.0.1:38132: read tcp 127.0.0.1:37771->127.0.0.1:38132: use of closed network connection +2026/04/04 05:52:46 http: TLS handshake error from 127.0.0.1:35858: read tcp 127.0.0.1:37559->127.0.0.1:35858: use of closed network connection +2026/04/04 05:52:46 http: TLS handshake error from 127.0.0.1:40846: read tcp 127.0.0.1:38045->127.0.0.1:40846: use of closed network connection +2026/04/04 05:52:46 http: TLS handshake error from 127.0.0.1:55874: remote error: tls: bad certificate +--- PASS: TestDialURL (0.15s) === RUN TestProxyTransport ---- PASS: TestProxyTransport (0.07s) +--- PASS: TestProxyTransport (0.02s) === RUN TestRewriteResponse ---- PASS: TestRewriteResponse (0.02s) +--- PASS: TestRewriteResponse (0.01s) === RUN TestServeHTTP -E0301 23:23:34.513523 4113594 upgradeaware.go:366] Proxy upgrade error: invalid upgrade response: status code 200 ---- PASS: TestServeHTTP (0.08s) +E0404 05:52:46.715639 834574 upgradeaware.go:366] Proxy upgrade error: invalid upgrade response: status code 200 +--- PASS: TestServeHTTP (0.04s) === RUN TestProxyUpgrade ---- PASS: TestProxyUpgrade (0.16s) +--- PASS: TestProxyUpgrade (0.06s) === RUN TestProxyUpgradeConnectionErrorResponse ---- PASS: TestProxyUpgradeConnectionErrorResponse (0.00s) +--- PASS: TestProxyUpgradeConnectionErrorResponse (0.01s) === RUN TestProxyUpgradeErrorResponseTerminates === RUN TestProxyUpgradeErrorResponseTerminates/code=400 === RUN TestProxyUpgradeErrorResponseTerminates/code=500 ---- PASS: TestProxyUpgradeErrorResponseTerminates (2.03s) - --- PASS: TestProxyUpgradeErrorResponseTerminates/code=400 (1.02s) - --- PASS: TestProxyUpgradeErrorResponseTerminates/code=500 (1.01s) +--- PASS: TestProxyUpgradeErrorResponseTerminates (2.01s) + --- PASS: TestProxyUpgradeErrorResponseTerminates/code=400 (1.01s) + --- PASS: TestProxyUpgradeErrorResponseTerminates/code=500 (1.00s) === RUN TestProxyUpgradeErrorResponse === RUN TestProxyUpgradeErrorResponse/code=200 -E0301 23:23:36.718364 4113594 upgradeaware.go:366] Proxy upgrade error: invalid upgrade response: status code 200 +E0404 05:52:48.803647 834574 upgradeaware.go:366] Proxy upgrade error: invalid upgrade response: status code 200 === RUN TestProxyUpgradeErrorResponse/code=300 -E0301 23:23:36.719598 4113594 upgradeaware.go:366] Proxy upgrade error: invalid upgrade response: status code 300 +E0404 05:52:48.804842 834574 upgradeaware.go:366] Proxy upgrade error: invalid upgrade response: status code 300 === RUN TestProxyUpgradeErrorResponse/code=302 -E0301 23:23:36.727910 4113594 upgradeaware.go:366] Proxy upgrade error: invalid upgrade response: status code 302 +E0404 05:52:48.805850 834574 upgradeaware.go:366] Proxy upgrade error: invalid upgrade response: status code 302 === RUN TestProxyUpgradeErrorResponse/code=307 -E0301 23:23:36.740443 4113594 upgradeaware.go:366] Proxy upgrade error: invalid upgrade response: status code 307 ---- PASS: TestProxyUpgradeErrorResponse (0.02s) +E0404 05:52:48.806831 834574 upgradeaware.go:366] Proxy upgrade error: invalid upgrade response: status code 307 +--- PASS: TestProxyUpgradeErrorResponse (0.01s) --- PASS: TestProxyUpgradeErrorResponse/code=200 (0.00s) --- PASS: TestProxyUpgradeErrorResponse/code=300 (0.00s) - --- PASS: TestProxyUpgradeErrorResponse/code=302 (0.01s) - --- PASS: TestProxyUpgradeErrorResponse/code=307 (0.01s) + --- PASS: TestProxyUpgradeErrorResponse/code=302 (0.00s) + --- PASS: TestProxyUpgradeErrorResponse/code=307 (0.00s) === RUN TestRejectForwardingRedirectsOption === RUN TestRejectForwardingRedirectsOption/reject_redirection_enabled_in_proxy,_backend_server_sending_200_response === RUN TestRejectForwardingRedirectsOption/reject_redirection_enabled_in_proxy,_backend_server_sending_301_response @@ -9686,17 +9719,17 @@ === RUN TestRejectForwardingRedirectsOption/reject_redirection_enabled_in_proxy,_backend_server_sending_304_response_with_no_location_header === RUN TestRejectForwardingRedirectsOption/reject_redirection_disabled_in_proxy,_backend_server_sending_200_response === RUN TestRejectForwardingRedirectsOption/reject_redirection_disabled_in_proxy,_backend_server_sending_301_response ---- PASS: TestRejectForwardingRedirectsOption (0.06s) +--- PASS: TestRejectForwardingRedirectsOption (0.02s) --- PASS: TestRejectForwardingRedirectsOption/reject_redirection_enabled_in_proxy,_backend_server_sending_200_response (0.00s) - --- PASS: TestRejectForwardingRedirectsOption/reject_redirection_enabled_in_proxy,_backend_server_sending_301_response (0.01s) - --- PASS: TestRejectForwardingRedirectsOption/reject_redirection_enabled_in_proxy,_backend_server_sending_304_response_with_a_location_header (0.01s) - --- PASS: TestRejectForwardingRedirectsOption/reject_redirection_enabled_in_proxy,_backend_server_sending_304_response_with_no_location_header (0.02s) + --- PASS: TestRejectForwardingRedirectsOption/reject_redirection_enabled_in_proxy,_backend_server_sending_301_response (0.00s) + --- PASS: TestRejectForwardingRedirectsOption/reject_redirection_enabled_in_proxy,_backend_server_sending_304_response_with_a_location_header (0.00s) + --- PASS: TestRejectForwardingRedirectsOption/reject_redirection_enabled_in_proxy,_backend_server_sending_304_response_with_no_location_header (0.00s) --- PASS: TestRejectForwardingRedirectsOption/reject_redirection_disabled_in_proxy,_backend_server_sending_200_response (0.00s) - --- PASS: TestRejectForwardingRedirectsOption/reject_redirection_disabled_in_proxy,_backend_server_sending_301_response (0.01s) + --- PASS: TestRejectForwardingRedirectsOption/reject_redirection_disabled_in_proxy,_backend_server_sending_301_response (0.00s) === RUN TestDefaultProxyTransport --- PASS: TestDefaultProxyTransport (0.00s) === RUN TestProxyRequestContentLengthAndTransferEncoding ---- PASS: TestProxyRequestContentLengthAndTransferEncoding (0.06s) +--- PASS: TestProxyRequestContentLengthAndTransferEncoding (0.03s) === RUN TestFlushIntervalHeaders --- PASS: TestFlushIntervalHeaders (0.00s) === RUN TestErrorPropagation @@ -9704,7 +9737,7 @@ === RUN TestProxyRedirectsforRootPath --- PASS: TestProxyRedirectsforRootPath (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/proxy 2.784s +ok k8s.io/apimachinery/pkg/util/proxy 2.397s === RUN TestString --- PASS: TestString (0.00s) === RUN TestRangePanic @@ -9718,22 +9751,22 @@ === RUN TestInt63nRange --- PASS: TestInt63nRange (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/rand 0.051s +ok k8s.io/apimachinery/pkg/util/rand 0.012s ? k8s.io/apimachinery/pkg/util/remotecommand [no test files] === RUN TestHandleCrash -E0301 23:23:34.176147 4113606 runtime_test.go:40] "Observed a panic" panic="Test Panic" stacktrace=< +E0404 05:52:46.491701 834589 runtime_test.go:40] "Observed a panic" panic="Test Panic" stacktrace=< goroutine 7 [running]: k8s.io/apimachinery/pkg/util/runtime.logPanic({0x6c8a68, 0x89a140}, {0x61caa0, 0x6c5cd0}) /build/reproducible-path/golang-k8s-apimachinery-0.31.4/_build/src/k8s.io/apimachinery/pkg/util/runtime/runtime.go:107 +0xbc k8s.io/apimachinery/pkg/util/runtime.handleCrash({0x6c8a68, 0x89a140}, {0x61caa0, 0x6c5cd0}, {0x89a140, 0x0, 0x43de18?}) /build/reproducible-path/golang-k8s-apimachinery-0.31.4/_build/src/k8s.io/apimachinery/pkg/util/runtime/runtime.go:82 +0x5a - k8s.io/apimachinery/pkg/util/runtime.HandleCrash({0x0, 0x0, 0xc0000fc540?}) + k8s.io/apimachinery/pkg/util/runtime.HandleCrash({0x0, 0x0, 0xc0001aa540?}) /build/reproducible-path/golang-k8s-apimachinery-0.31.4/_build/src/k8s.io/apimachinery/pkg/util/runtime/runtime.go:59 +0x105 panic({0x61caa0?, 0x6c5cd0?}) /usr/lib/go-1.24/src/runtime/panic.go:787 +0x132 - k8s.io/apimachinery/pkg/util/runtime.TestHandleCrash(0xc0000fc380?) + k8s.io/apimachinery/pkg/util/runtime.TestHandleCrash(0xc0001aa380?) /build/reproducible-path/golang-k8s-apimachinery-0.31.4/_build/src/k8s.io/apimachinery/pkg/util/runtime/runtime_test.go:40 +0x5d - testing.tRunner(0xc0000fc380, 0x6851c8) + testing.tRunner(0xc0001aa380, 0x6851c8) /usr/lib/go-1.24/src/testing/testing.go:1792 +0xf4 created by testing.(*T).Run in goroutine 1 /usr/lib/go-1.24/src/testing/testing.go:1851 +0x413 @@ -9745,37 +9778,37 @@ --- PASS: TestCustomHandleError (0.00s) === RUN TestHandleCrashLog runtime_test.go:105: Got log output: - E0301 23:23:34.176413 4113606 runtime_test.go:90] "Observed a panic" panic="test panic" stacktrace=< + E0404 05:52:46.492464 834589 runtime_test.go:90] "Observed a panic" panic="test panic" stacktrace=< goroutine 10 [running]: k8s.io/apimachinery/pkg/util/runtime.logPanic({0x6c8a68, 0x89a140}, {0x61caa0, 0x6c5cf0}) /build/reproducible-path/golang-k8s-apimachinery-0.31.4/_build/src/k8s.io/apimachinery/pkg/util/runtime/runtime.go:107 +0xbc k8s.io/apimachinery/pkg/util/runtime.handleCrash({0x6c8a68, 0x89a140}, {0x61caa0, 0x6c5cf0}, {0x89a140, 0x0, 0x43de18?}) /build/reproducible-path/golang-k8s-apimachinery-0.31.4/_build/src/k8s.io/apimachinery/pkg/util/runtime/runtime.go:82 +0x5a - k8s.io/apimachinery/pkg/util/runtime.HandleCrash({0x0, 0x0, 0xc0000fc540?}) + k8s.io/apimachinery/pkg/util/runtime.HandleCrash({0x0, 0x0, 0xc0001aa540?}) /build/reproducible-path/golang-k8s-apimachinery-0.31.4/_build/src/k8s.io/apimachinery/pkg/util/runtime/runtime.go:59 +0x105 panic({0x61caa0?, 0x6c5cf0?}) /usr/lib/go-1.24/src/runtime/panic.go:787 +0x132 k8s.io/apimachinery/pkg/util/runtime.TestHandleCrashLog.func1() /build/reproducible-path/golang-k8s-apimachinery-0.31.4/_build/src/k8s.io/apimachinery/pkg/util/runtime/runtime_test.go:90 +0x65 - k8s.io/apimachinery/pkg/util/runtime.captureStderr(0xc000086f50) + k8s.io/apimachinery/pkg/util/runtime.captureStderr(0xc0000acf50) /build/reproducible-path/golang-k8s-apimachinery-0.31.4/_build/src/k8s.io/apimachinery/pkg/util/runtime/runtime_test.go:158 +0x112 - k8s.io/apimachinery/pkg/util/runtime.TestHandleCrashLog(0xc0000fca80) + k8s.io/apimachinery/pkg/util/runtime.TestHandleCrashLog(0xc0001aaa80) /build/reproducible-path/golang-k8s-apimachinery-0.31.4/_build/src/k8s.io/apimachinery/pkg/util/runtime/runtime_test.go:83 +0x35 - testing.tRunner(0xc0000fca80, 0x6851d0) + testing.tRunner(0xc0001aaa80, 0x6851d0) /usr/lib/go-1.24/src/testing/testing.go:1792 +0xf4 created by testing.(*T).Run in goroutine 1 /usr/lib/go-1.24/src/testing/testing.go:1851 +0x413 > ---- PASS: TestHandleCrashLog (0.00s) +--- PASS: TestHandleCrashLog (0.01s) === RUN TestHandleCrashLogSilenceHTTPErrAbortHandler --- PASS: TestHandleCrashLogSilenceHTTPErrAbortHandler (0.00s) === RUN Test_rudimentaryErrorBackoff_OnError_ParallelSleep --- PASS: Test_rudimentaryErrorBackoff_OnError_ParallelSleep (1.01s) === RUN ExampleHandleErrorWithContext -E0301 23:23:35.185104 4113606 runtime_stack_test.go:60] "test" err="fake error" logger="UnhandledError" request=42 +E0404 05:52:47.506731 834589 runtime_stack_test.go:60] "test" err="fake error" logger="UnhandledError" request=42 --- PASS: ExampleHandleErrorWithContext (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/runtime 1.077s +ok k8s.io/apimachinery/pkg/util/runtime 1.042s === RUN TestStringSet --- PASS: TestStringSet (0.00s) === RUN TestStringSetDeleteMultiples @@ -9827,154 +9860,154 @@ === RUN TestIntersection --- PASS: TestIntersection (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/sets 0.060s +ok k8s.io/apimachinery/pkg/util/sets 0.017s === RUN TestSortMergeLists --- PASS: TestSortMergeLists (0.01s) === RUN TestCustomStrategicMergePatch === RUN TestCustomStrategicMergePatch/unique_scalars_when_merging_lists === RUN TestCustomStrategicMergePatch/unique_scalars_when_merging_lists/struct -=== RUN TestCustomStrategicMergePatch/unique_scalars_when_merging_lists/Kind([mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value]) +=== RUN TestCustomStrategicMergePatch/unique_scalars_when_merging_lists/Kind([name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList]) === RUN TestCustomStrategicMergePatch/unique_scalars_when_merging_lists/Struct === RUN TestCustomStrategicMergePatch/delete_map_from_nested_map === RUN TestCustomStrategicMergePatch/delete_map_from_nested_map/struct -=== RUN TestCustomStrategicMergePatch/delete_map_from_nested_map/Kind([value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name]) +=== RUN TestCustomStrategicMergePatch/delete_map_from_nested_map/Kind([replacingItem_retainKeysMergingList_name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap]) === RUN TestCustomStrategicMergePatch/delete_map_from_nested_map/Struct === RUN TestCustomStrategicMergePatch/delete_all_items_from_merging_list === RUN TestCustomStrategicMergePatch/delete_all_items_from_merging_list/struct -=== RUN TestCustomStrategicMergePatch/delete_all_items_from_merging_list/Kind([name_value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap]) +=== RUN TestCustomStrategicMergePatch/delete_all_items_from_merging_list/Kind([name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList]) === RUN TestCustomStrategicMergePatch/delete_all_items_from_merging_list/Struct === RUN TestCustomStrategicMergePatch/merge_empty_merging_lists === RUN TestCustomStrategicMergePatch/merge_empty_merging_lists/struct -=== RUN TestCustomStrategicMergePatch/merge_empty_merging_lists/Kind([name_value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap]) +=== RUN TestCustomStrategicMergePatch/merge_empty_merging_lists/Kind([name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList]) === RUN TestCustomStrategicMergePatch/merge_empty_merging_lists/Struct === RUN TestCustomStrategicMergePatch/delete_all_keys_from_map === RUN TestCustomStrategicMergePatch/delete_all_keys_from_map/struct -=== RUN TestCustomStrategicMergePatch/delete_all_keys_from_map/Kind([retainKeysMap_name_value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem]) +=== RUN TestCustomStrategicMergePatch/delete_all_keys_from_map/Kind([name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList]) === RUN TestCustomStrategicMergePatch/delete_all_keys_from_map/Struct === RUN TestCustomStrategicMergePatch/add_key_and_delete_all_keys_from_map === RUN TestCustomStrategicMergePatch/add_key_and_delete_all_keys_from_map/struct -=== RUN TestCustomStrategicMergePatch/add_key_and_delete_all_keys_from_map/Kind([name_value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap]) +=== RUN TestCustomStrategicMergePatch/add_key_and_delete_all_keys_from_map/Kind([name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList]) === RUN TestCustomStrategicMergePatch/add_key_and_delete_all_keys_from_map/Struct === RUN TestCustomStrategicMergePatch/delete_all_duplicate_entries_in_a_merging_list === RUN TestCustomStrategicMergePatch/delete_all_duplicate_entries_in_a_merging_list/struct -=== RUN TestCustomStrategicMergePatch/delete_all_duplicate_entries_in_a_merging_list/Kind([other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingIntList_simpleMap_retainKeysMergingList]) +=== RUN TestCustomStrategicMergePatch/delete_all_duplicate_entries_in_a_merging_list/Kind([other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList_name_value]) === RUN TestCustomStrategicMergePatch/delete_all_duplicate_entries_in_a_merging_list/Struct === RUN TestCustomStrategicMergePatch/retainKeys_map_can_add_a_field_when_no_retainKeys_directive_present === RUN TestCustomStrategicMergePatch/retainKeys_map_can_add_a_field_when_no_retainKeys_directive_present/struct -=== RUN TestCustomStrategicMergePatch/retainKeys_map_can_add_a_field_when_no_retainKeys_directive_present/Kind([name_value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap]) +=== RUN TestCustomStrategicMergePatch/retainKeys_map_can_add_a_field_when_no_retainKeys_directive_present/Kind([name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList]) === RUN TestCustomStrategicMergePatch/retainKeys_map_can_add_a_field_when_no_retainKeys_directive_present/Struct === RUN TestCustomStrategicMergePatch/retainKeys_map_can_change_a_field_when_no_retainKeys_directive_present === RUN TestCustomStrategicMergePatch/retainKeys_map_can_change_a_field_when_no_retainKeys_directive_present/struct -=== RUN TestCustomStrategicMergePatch/retainKeys_map_can_change_a_field_when_no_retainKeys_directive_present/Kind([name_value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap]) +=== RUN TestCustomStrategicMergePatch/retainKeys_map_can_change_a_field_when_no_retainKeys_directive_present/Kind([other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList_name_value]) === RUN TestCustomStrategicMergePatch/retainKeys_map_can_change_a_field_when_no_retainKeys_directive_present/Struct === RUN TestCustomStrategicMergePatch/retainKeys_map_can_delete_a_field_when_no_retainKeys_directive_present === RUN TestCustomStrategicMergePatch/retainKeys_map_can_delete_a_field_when_no_retainKeys_directive_present/struct -=== RUN TestCustomStrategicMergePatch/retainKeys_map_can_delete_a_field_when_no_retainKeys_directive_present/Kind([name_value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap]) +=== RUN TestCustomStrategicMergePatch/retainKeys_map_can_delete_a_field_when_no_retainKeys_directive_present/Kind([mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList_name_value_other]) === RUN TestCustomStrategicMergePatch/retainKeys_map_can_delete_a_field_when_no_retainKeys_directive_present/Struct === RUN TestCustomStrategicMergePatch/retainKeys_map_merge_an_empty_map === RUN TestCustomStrategicMergePatch/retainKeys_map_merge_an_empty_map/struct -=== RUN TestCustomStrategicMergePatch/retainKeys_map_merge_an_empty_map/Kind([mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList_nonMergingIntList]) +=== RUN TestCustomStrategicMergePatch/retainKeys_map_merge_an_empty_map/Kind([other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList_name_value]) === RUN TestCustomStrategicMergePatch/retainKeys_map_merge_an_empty_map/Struct === RUN TestCustomStrategicMergePatch/retainKeys_list_can_add_a_field_when_no_retainKeys_directive_present === RUN TestCustomStrategicMergePatch/retainKeys_list_can_add_a_field_when_no_retainKeys_directive_present/struct -=== RUN TestCustomStrategicMergePatch/retainKeys_list_can_add_a_field_when_no_retainKeys_directive_present/Kind([other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingIntList_simpleMap_retainKeysMergingList]) +=== RUN TestCustomStrategicMergePatch/retainKeys_list_can_add_a_field_when_no_retainKeys_directive_present/Kind([name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList]) === RUN TestCustomStrategicMergePatch/retainKeys_list_can_add_a_field_when_no_retainKeys_directive_present/Struct === RUN TestCustomStrategicMergePatch/retainKeys_list_can_change_a_field_when_no_retainKeys_directive_present === RUN TestCustomStrategicMergePatch/retainKeys_list_can_change_a_field_when_no_retainKeys_directive_present/struct -=== RUN TestCustomStrategicMergePatch/retainKeys_list_can_change_a_field_when_no_retainKeys_directive_present/Kind([nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList]) +=== RUN TestCustomStrategicMergePatch/retainKeys_list_can_change_a_field_when_no_retainKeys_directive_present/Kind([name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList]) === RUN TestCustomStrategicMergePatch/retainKeys_list_can_change_a_field_when_no_retainKeys_directive_present/Struct === RUN TestCustomStrategicMergePatch/retainKeys_list_can_delete_a_field_when_no_retainKeys_directive_present === RUN TestCustomStrategicMergePatch/retainKeys_list_can_delete_a_field_when_no_retainKeys_directive_present/struct -=== RUN TestCustomStrategicMergePatch/retainKeys_list_can_delete_a_field_when_no_retainKeys_directive_present/Kind([nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList]) +=== RUN TestCustomStrategicMergePatch/retainKeys_list_can_delete_a_field_when_no_retainKeys_directive_present/Kind([simpleMap_replacingItem_retainKeysMergingList_name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList]) === RUN TestCustomStrategicMergePatch/retainKeys_list_can_delete_a_field_when_no_retainKeys_directive_present/Struct === RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list === RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list/struct -=== RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list/Kind([nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList]) +=== RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list/Kind([name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList]) === RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list/Struct === RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list_2 === RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list_2/struct -=== RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list_2/Kind([other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingIntList_simpleMap_retainKeysMergingList]) +=== RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list_2/Kind([mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList_name_value_other]) === RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list_2/Struct === RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list === RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list/struct -=== RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list/Kind([nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList]) +=== RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list/Kind([name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList]) === RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list/Struct === RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list#01 === RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list#01/struct -=== RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list#01/Kind([other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingIntList_simpleMap_retainKeysMergingList]) +=== RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list#01/Kind([name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList]) === RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list#01/Struct ---- PASS: TestCustomStrategicMergePatch (0.31s) - --- PASS: TestCustomStrategicMergePatch/unique_scalars_when_merging_lists (0.01s) +--- PASS: TestCustomStrategicMergePatch (0.23s) + --- PASS: TestCustomStrategicMergePatch/unique_scalars_when_merging_lists (0.02s) --- PASS: TestCustomStrategicMergePatch/unique_scalars_when_merging_lists/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/unique_scalars_when_merging_lists/Kind([mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/unique_scalars_when_merging_lists/Kind([name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList]) (0.00s) --- PASS: TestCustomStrategicMergePatch/unique_scalars_when_merging_lists/Struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/delete_map_from_nested_map (0.02s) + --- PASS: TestCustomStrategicMergePatch/delete_map_from_nested_map (0.01s) --- PASS: TestCustomStrategicMergePatch/delete_map_from_nested_map/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/delete_map_from_nested_map/Kind([value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/delete_map_from_nested_map/Kind([replacingItem_retainKeysMergingList_name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap]) (0.00s) --- PASS: TestCustomStrategicMergePatch/delete_map_from_nested_map/Struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/delete_all_items_from_merging_list (0.00s) + --- PASS: TestCustomStrategicMergePatch/delete_all_items_from_merging_list (0.01s) --- PASS: TestCustomStrategicMergePatch/delete_all_items_from_merging_list/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/delete_all_items_from_merging_list/Kind([name_value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/delete_all_items_from_merging_list/Kind([name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList]) (0.00s) --- PASS: TestCustomStrategicMergePatch/delete_all_items_from_merging_list/Struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/merge_empty_merging_lists (0.02s) + --- PASS: TestCustomStrategicMergePatch/merge_empty_merging_lists (0.01s) --- PASS: TestCustomStrategicMergePatch/merge_empty_merging_lists/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/merge_empty_merging_lists/Kind([name_value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/merge_empty_merging_lists/Kind([name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList]) (0.00s) --- PASS: TestCustomStrategicMergePatch/merge_empty_merging_lists/Struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/delete_all_keys_from_map (0.00s) + --- PASS: TestCustomStrategicMergePatch/delete_all_keys_from_map (0.01s) --- PASS: TestCustomStrategicMergePatch/delete_all_keys_from_map/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/delete_all_keys_from_map/Kind([retainKeysMap_name_value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/delete_all_keys_from_map/Kind([name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList]) (0.00s) --- PASS: TestCustomStrategicMergePatch/delete_all_keys_from_map/Struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/add_key_and_delete_all_keys_from_map (0.02s) + --- PASS: TestCustomStrategicMergePatch/add_key_and_delete_all_keys_from_map (0.01s) --- PASS: TestCustomStrategicMergePatch/add_key_and_delete_all_keys_from_map/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/add_key_and_delete_all_keys_from_map/Kind([name_value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/add_key_and_delete_all_keys_from_map/Kind([name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList]) (0.00s) --- PASS: TestCustomStrategicMergePatch/add_key_and_delete_all_keys_from_map/Struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/delete_all_duplicate_entries_in_a_merging_list (0.03s) + --- PASS: TestCustomStrategicMergePatch/delete_all_duplicate_entries_in_a_merging_list (0.01s) --- PASS: TestCustomStrategicMergePatch/delete_all_duplicate_entries_in_a_merging_list/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/delete_all_duplicate_entries_in_a_merging_list/Kind([other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingIntList_simpleMap_retainKeysMergingList]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/delete_all_duplicate_entries_in_a_merging_list/Kind([other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList_name_value]) (0.00s) --- PASS: TestCustomStrategicMergePatch/delete_all_duplicate_entries_in_a_merging_list/Struct (0.00s) --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_add_a_field_when_no_retainKeys_directive_present (0.01s) --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_add_a_field_when_no_retainKeys_directive_present/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_add_a_field_when_no_retainKeys_directive_present/Kind([name_value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_add_a_field_when_no_retainKeys_directive_present/Kind([name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList]) (0.00s) --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_add_a_field_when_no_retainKeys_directive_present/Struct (0.00s) --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_change_a_field_when_no_retainKeys_directive_present (0.02s) --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_change_a_field_when_no_retainKeys_directive_present/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_change_a_field_when_no_retainKeys_directive_present/Kind([name_value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_change_a_field_when_no_retainKeys_directive_present/Kind([other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList_name_value]) (0.00s) --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_change_a_field_when_no_retainKeys_directive_present/Struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_delete_a_field_when_no_retainKeys_directive_present (0.02s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_delete_a_field_when_no_retainKeys_directive_present (0.01s) --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_delete_a_field_when_no_retainKeys_directive_present/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_delete_a_field_when_no_retainKeys_directive_present/Kind([name_value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_delete_a_field_when_no_retainKeys_directive_present/Kind([mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList_name_value_other]) (0.00s) --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_delete_a_field_when_no_retainKeys_directive_present/Struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_map_merge_an_empty_map (0.01s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_map_merge_an_empty_map (0.02s) --- PASS: TestCustomStrategicMergePatch/retainKeys_map_merge_an_empty_map/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_map_merge_an_empty_map/Kind([mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList_nonMergingIntList]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_map_merge_an_empty_map/Kind([other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList_name_value]) (0.01s) --- PASS: TestCustomStrategicMergePatch/retainKeys_map_merge_an_empty_map/Struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_add_a_field_when_no_retainKeys_directive_present (0.02s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_add_a_field_when_no_retainKeys_directive_present (0.01s) --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_add_a_field_when_no_retainKeys_directive_present/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_add_a_field_when_no_retainKeys_directive_present/Kind([other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingIntList_simpleMap_retainKeysMergingList]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_add_a_field_when_no_retainKeys_directive_present/Kind([name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList]) (0.00s) --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_add_a_field_when_no_retainKeys_directive_present/Struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_change_a_field_when_no_retainKeys_directive_present (0.00s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_change_a_field_when_no_retainKeys_directive_present (0.01s) --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_change_a_field_when_no_retainKeys_directive_present/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_change_a_field_when_no_retainKeys_directive_present/Kind([nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_change_a_field_when_no_retainKeys_directive_present/Kind([name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList]) (0.00s) --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_change_a_field_when_no_retainKeys_directive_present/Struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_delete_a_field_when_no_retainKeys_directive_present (0.03s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_delete_a_field_when_no_retainKeys_directive_present (0.01s) --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_delete_a_field_when_no_retainKeys_directive_present/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_delete_a_field_when_no_retainKeys_directive_present/Kind([nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_delete_a_field_when_no_retainKeys_directive_present/Kind([simpleMap_replacingItem_retainKeysMergingList_name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList]) (0.00s) --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_delete_a_field_when_no_retainKeys_directive_present/Struct (0.00s) --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list (0.01s) --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list/Kind([nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list/Kind([name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList]) (0.00s) --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list/Struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list_2 (0.03s) + --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list_2 (0.02s) --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list_2/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list_2/Kind([other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingIntList_simpleMap_retainKeysMergingList]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list_2/Kind([mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList_name_value_other]) (0.00s) --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list_2/Struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list (0.02s) + --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list (0.01s) --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list/Kind([nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingIntList_simpleMap_retainKeysMergingList_other_mergingList_nonMergingList]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list/Kind([name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList]) (0.00s) --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list/Struct (0.00s) --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list#01 (0.01s) --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list#01/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list#01/Kind([other_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingIntList_simpleMap_retainKeysMergingList]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list#01/Kind([name_value_other_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_nonMergingList_simpleMap_replacingItem_retainKeysMergingList]) (0.00s) --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list#01/Struct (0.00s) === RUN TestStrategicMergePatch === RUN TestStrategicMergePatch/struct @@ -11902,51 +11935,51 @@ === RUN TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#09 === RUN TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#09 === RUN TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#09 -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap]) -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/nil_original/TwoWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/nil_original/ThreeWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/nil_patch/TwoWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/nil_patch/ThreeWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/add_field_to_map/TwoWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/add_field_to_map/ThreeWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/add_field_to_map_with_conflict/TwoWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/add_field_to_map_with_conflict/ThreeWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/add_field_and_delete_field_from_map/TwoWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/add_field_and_delete_field_from_map/ThreeWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/add_field_and_delete_field_from_map_with_conflict/TwoWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/add_field_and_delete_field_from_map_with_conflict/ThreeWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_field_from_nested_map/TwoWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_field_from_nested_map/ThreeWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_field_from_nested_map_with_conflict/TwoWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_field_from_nested_map_with_conflict/ThreeWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_all_fields_from_map/TwoWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_all_fields_from_map/ThreeWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_all_fields_from_map_with_conflict/TwoWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_all_fields_from_map_with_conflict/ThreeWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/add_field_and_delete_all_fields_from_map/TwoWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/add_field_and_delete_all_fields_from_map/ThreeWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/add_field_and_delete_all_fields_from_map_with_conflict/TwoWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/add_field_and_delete_all_fields_from_map_with_conflict/ThreeWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/replace_list_of_scalars/TwoWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/replace_list_of_scalars/ThreeWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/replace_list_of_scalars_with_conflict/TwoWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/replace_list_of_scalars_with_conflict/ThreeWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_all_maps_from_merging_list/TwoWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_all_maps_from_merging_list/ThreeWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_all_maps_from_merging_list_with_conflict/TwoWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_all_maps_from_merging_list_with_conflict/ThreeWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_all_maps_from_empty_merging_list/TwoWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_all_maps_from_empty_merging_list/ThreeWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/merge_empty_merging_lists/TwoWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/merge_empty_merging_lists/ThreeWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/TwoWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/ThreeWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/defined_null_values_should_propagate_removing_original_fields/TwoWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/defined_null_values_should_propagate_removing_original_fields/ThreeWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/nil_patch_with_retainKeys_map/TwoWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/nil_patch_with_retainKeys_map/ThreeWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/retainKeys_map_with_no_change_should_not_be_present/TwoWay -=== RUN TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/retainKeys_map_with_no_change_should_not_be_present/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList]) +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/nil_original/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/nil_original/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/nil_patch/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/nil_patch/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/add_field_to_map/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/add_field_to_map/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/add_field_to_map_with_conflict/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/add_field_to_map_with_conflict/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/add_field_and_delete_field_from_map/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/add_field_and_delete_field_from_map/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/add_field_and_delete_field_from_map_with_conflict/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/add_field_and_delete_field_from_map_with_conflict/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_field_from_nested_map/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_field_from_nested_map/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_field_from_nested_map_with_conflict/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_field_from_nested_map_with_conflict/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_all_fields_from_map/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_all_fields_from_map/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_all_fields_from_map_with_conflict/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_all_fields_from_map_with_conflict/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/add_field_and_delete_all_fields_from_map/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/add_field_and_delete_all_fields_from_map/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/add_field_and_delete_all_fields_from_map_with_conflict/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/add_field_and_delete_all_fields_from_map_with_conflict/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/replace_list_of_scalars/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/replace_list_of_scalars/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/replace_list_of_scalars_with_conflict/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/replace_list_of_scalars_with_conflict/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_all_maps_from_merging_list/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_all_maps_from_merging_list/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_all_maps_from_merging_list_with_conflict/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_all_maps_from_merging_list_with_conflict/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_all_maps_from_empty_merging_list/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_all_maps_from_empty_merging_list/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/merge_empty_merging_lists/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/merge_empty_merging_lists/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/defined_null_values_should_propagate_removing_original_fields/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/defined_null_values_should_propagate_removing_original_fields/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/nil_patch_with_retainKeys_map/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/nil_patch_with_retainKeys_map/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/retainKeys_map_with_no_change_should_not_be_present/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/retainKeys_map_with_no_change_should_not_be_present/ThreeWay === RUN TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#10 === RUN TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#10 === RUN TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#10 @@ -15752,8 +15785,8 @@ === RUN TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#29 === RUN TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#29 === RUN TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#29 ---- PASS: TestStrategicMergePatch (10.09s) - --- PASS: TestStrategicMergePatch/struct (0.01s) +--- PASS: TestStrategicMergePatch (8.44s) + --- PASS: TestStrategicMergePatch/struct (0.02s) --- PASS: TestStrategicMergePatch/struct/nil_original/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/struct/nil_original/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/struct/nil_patch/TwoWay (0.00s) @@ -15772,7 +15805,7 @@ --- PASS: TestStrategicMergePatch/struct/delete_field_from_nested_map_with_conflict/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/struct/delete_all_fields_from_map/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/struct/delete_all_fields_from_map/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/struct/delete_all_fields_from_map_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/struct/delete_all_fields_from_map_with_conflict/TwoWay (0.01s) --- PASS: TestStrategicMergePatch/struct/delete_all_fields_from_map_with_conflict/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/struct/add_field_and_delete_all_fields_from_map/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/struct/add_field_and_delete_all_fields_from_map/ThreeWay (0.00s) @@ -15799,7 +15832,7 @@ --- PASS: TestStrategicMergePatch/struct/retainKeys_map_with_no_change_should_not_be_present/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/struct/retainKeys_map_with_no_change_should_not_be_present/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay (0.01s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay (0.00s) @@ -15807,9 +15840,9 @@ --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#01 (0.00s) @@ -15825,7 +15858,7 @@ --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay (0.00s) @@ -15841,7 +15874,7 @@ --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay (0.00s) @@ -15851,7 +15884,7 @@ --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay (0.00s) @@ -15859,7 +15892,7 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay (0.00s) @@ -15867,7 +15900,7 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay (0.00s) @@ -15891,7 +15924,7 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay (0.00s) @@ -15901,9 +15934,9 @@ --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay (0.00s) @@ -15913,7 +15946,7 @@ --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay (0.00s) @@ -15925,14 +15958,14 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay (0.00s) @@ -15953,23 +15986,23 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay (0.00s) @@ -15986,7 +16019,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#01 (0.01s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#01 (0.00s) @@ -15997,9 +16030,9 @@ --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#01 (0.00s) @@ -16021,7 +16054,7 @@ --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#01 (0.00s) @@ -16029,8 +16062,8 @@ --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#01 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#01 (0.00s) @@ -16047,15 +16080,15 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#02 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#01 (0.01s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#01 (0.00s) @@ -16066,21 +16099,21 @@ --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#01 (0.01s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#01 (0.02s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#01 (0.00s) @@ -16114,7 +16147,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#01 (0.00s) @@ -16125,7 +16158,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#01 (0.00s) @@ -16149,9 +16182,9 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#01 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#01 (0.00s) @@ -16160,12 +16193,12 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#01 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#01 (0.00s) @@ -16175,7 +16208,7 @@ --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#02 (0.00s) @@ -16186,12 +16219,12 @@ --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#04 (0.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#05 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#02 (0.00s) @@ -16209,25 +16242,25 @@ --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#02 (0.00s) @@ -16235,15 +16268,15 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#05 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#02 (0.01s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#02 (0.00s) @@ -16254,25 +16287,25 @@ --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#02 (0.01s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#02 (0.00s) @@ -16285,7 +16318,7 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#02 (0.01s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#02 (0.00s) @@ -16295,7 +16328,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#02 (0.00s) @@ -16307,18 +16340,18 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#02 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#02 (0.00s) @@ -16335,7 +16368,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#02 (0.00s) @@ -16345,11 +16378,11 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#02 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#02 (0.00s) @@ -16381,15 +16414,15 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#03 (0.00s) @@ -16405,16 +16438,16 @@ --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#03 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#03 (0.00s) @@ -16423,7 +16456,7 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#03 (0.00s) @@ -16441,7 +16474,7 @@ --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#03 (0.00s) @@ -16472,9 +16505,9 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#03 (0.01s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#03 (0.00s) @@ -16485,11 +16518,11 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#03 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#03 (0.00s) @@ -16503,7 +16536,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#03 (0.00s) @@ -16511,10 +16544,10 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#03 (0.00s) @@ -16535,15 +16568,15 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#03 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#03 (0.00s) @@ -16563,18 +16596,18 @@ --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#08 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#04 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#04 (0.01s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#04 (0.01s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#04 (0.01s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#04 (0.00s) @@ -16589,7 +16622,7 @@ --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#04 (0.01s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#04 (0.00s) @@ -16601,7 +16634,7 @@ --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#04 (0.00s) @@ -16615,15 +16648,15 @@ --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#04 (0.02s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#04 (0.00s) @@ -16639,13 +16672,13 @@ --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#04 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#04 (0.00s) @@ -16688,14 +16721,14 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#04 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#04 (0.00s) @@ -16708,11 +16741,11 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#04 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#04 (0.00s) @@ -16723,19 +16756,19 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#04 (0.03s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#04 (0.01s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#05 (0.00s) @@ -16749,13 +16782,13 @@ --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#11 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#05 (0.00s) @@ -16767,7 +16800,7 @@ --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#05 (0.02s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#05 (0.00s) @@ -16781,15 +16814,15 @@ --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#05 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#05 (0.00s) @@ -16803,17 +16836,17 @@ --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#05 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#05 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#05 (0.00s) @@ -16835,18 +16868,18 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#05 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#05 (0.00s) @@ -16857,7 +16890,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#05 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#05 (0.00s) @@ -16878,11 +16911,11 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#05 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#05 (0.00s) @@ -16890,7 +16923,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#05 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#05 (0.00s) @@ -16904,10 +16937,10 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#05 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#05 (0.00s) @@ -16921,9 +16954,9 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#05 (0.01s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#06 (0.00s) @@ -16939,7 +16972,7 @@ --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#12 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#12 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#06 (0.00s) @@ -16951,10 +16984,10 @@ --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#06 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#06 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#06 (0.00s) @@ -16969,7 +17002,7 @@ --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#06 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#06 (0.00s) @@ -16977,14 +17010,14 @@ --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#06 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#12 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#12 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#13 (0.00s) @@ -16994,7 +17027,7 @@ --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#06 (0.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#06 (0.00s) @@ -17014,18 +17047,18 @@ --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#06 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#06 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#06 (0.02s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#06 (0.00s) @@ -17049,7 +17082,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#06 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#06 (0.00s) @@ -17063,15 +17096,15 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#06 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#06 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#06 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#06 (0.00s) @@ -17095,11 +17128,11 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#06 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#06 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#06 (0.00s) @@ -17125,13 +17158,13 @@ --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#07 (0.00s) @@ -17147,7 +17180,7 @@ --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#07 (0.00s) @@ -17170,9 +17203,9 @@ --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#14 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#15 (0.00s) @@ -17183,7 +17216,7 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#07 (0.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#07 (0.00s) @@ -17192,7 +17225,7 @@ --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#07 (0.01s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#07 (0.00s) @@ -17201,15 +17234,15 @@ --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#07 (0.00s) @@ -17218,7 +17251,7 @@ --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#07 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#07 (0.00s) @@ -17246,20 +17279,20 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#07 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#07 (0.00s) @@ -17267,7 +17300,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#07 (0.00s) @@ -17275,18 +17308,18 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#07 (0.00s) @@ -17303,18 +17336,18 @@ --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#08 (0.01s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#16 (0.03s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#17 (0.00s) @@ -17332,18 +17365,18 @@ --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#08 (0.01s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#08 (0.01s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#08 (0.00s) @@ -17355,15 +17388,15 @@ --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#08 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#17 (0.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#08 (0.00s) @@ -17371,20 +17404,20 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#08 (0.01s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#08 (0.01s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#08 (0.02s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#08 (0.00s) @@ -17395,7 +17428,7 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#08 (0.00s) @@ -17423,7 +17456,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#08 (0.00s) @@ -17435,8 +17468,8 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#08 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#08 (0.00s) @@ -17454,7 +17487,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#08 (0.00s) @@ -17466,14 +17499,14 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#08 (0.00s) @@ -17482,26 +17515,26 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#08 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#09 (0.02s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#19 (0.00s) @@ -17516,14 +17549,14 @@ --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#09 (0.02s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#09 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#09 (0.00s) @@ -17531,39 +17564,39 @@ --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#09 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#09 (0.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#09 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#09 (0.02s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#09 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#09 (0.02s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#09 (0.00s) @@ -17575,13 +17608,13 @@ --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#09 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#09 (0.00s) @@ -17591,7 +17624,7 @@ --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#09 (0.00s) @@ -17619,7 +17652,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#09 (0.00s) @@ -17629,13 +17662,13 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#09 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#09 (0.00s) @@ -17658,9 +17691,9 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#09 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#09 (0.00s) @@ -17669,92 +17702,92 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#09 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap]) (0.03s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/nil_original/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/nil_original/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/nil_patch/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/nil_patch/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/add_field_to_map/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/add_field_to_map/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/add_field_to_map_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/add_field_to_map_with_conflict/ThreeWay (0.01s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/add_field_and_delete_field_from_map/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/add_field_and_delete_field_from_map/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/add_field_and_delete_field_from_map_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/add_field_and_delete_field_from_map_with_conflict/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_field_from_nested_map/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_field_from_nested_map/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_field_from_nested_map_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_field_from_nested_map_with_conflict/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_all_fields_from_map/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_all_fields_from_map/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_all_fields_from_map_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_all_fields_from_map_with_conflict/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/add_field_and_delete_all_fields_from_map/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/add_field_and_delete_all_fields_from_map/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/add_field_and_delete_all_fields_from_map_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/add_field_and_delete_all_fields_from_map_with_conflict/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/replace_list_of_scalars/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/replace_list_of_scalars/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/replace_list_of_scalars_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/replace_list_of_scalars_with_conflict/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_all_maps_from_merging_list/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_all_maps_from_merging_list/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_all_maps_from_merging_list_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_all_maps_from_merging_list_with_conflict/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_all_maps_from_empty_merging_list/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/delete_all_maps_from_empty_merging_list/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/merge_empty_merging_lists/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/merge_empty_merging_lists/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/defined_null_values_should_propagate_removing_original_fields/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/defined_null_values_should_propagate_removing_original_fields/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/nil_patch_with_retainKeys_map/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/nil_patch_with_retainKeys_map/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/retainKeys_map_with_no_change_should_not_be_present/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([replacingItem_retainKeysMergingList_name_value_mergeItemPtr_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_simpleMap])/retainKeys_map_with_no_change_should_not_be_present/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList]) (0.02s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/nil_original/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/nil_original/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/nil_patch/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/nil_patch/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/add_field_to_map/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/add_field_to_map/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/add_field_to_map_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/add_field_to_map_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/add_field_and_delete_field_from_map/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/add_field_and_delete_field_from_map/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/add_field_and_delete_field_from_map_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/add_field_and_delete_field_from_map_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_field_from_nested_map/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_field_from_nested_map/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_field_from_nested_map_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_field_from_nested_map_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_all_fields_from_map/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_all_fields_from_map/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_all_fields_from_map_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_all_fields_from_map_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/add_field_and_delete_all_fields_from_map/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/add_field_and_delete_all_fields_from_map/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/add_field_and_delete_all_fields_from_map_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/add_field_and_delete_all_fields_from_map_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/replace_list_of_scalars/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/replace_list_of_scalars/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/replace_list_of_scalars_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/replace_list_of_scalars_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_all_maps_from_merging_list/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_all_maps_from_merging_list/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_all_maps_from_merging_list_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_all_maps_from_merging_list_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_all_maps_from_empty_merging_list/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/delete_all_maps_from_empty_merging_list/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/merge_empty_merging_lists/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/merge_empty_merging_lists/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/defined_null_values_should_propagate_removing_original_fields/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/defined_null_values_should_propagate_removing_original_fields/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/nil_patch_with_retainKeys_map/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/nil_patch_with_retainKeys_map/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/retainKeys_map_with_no_change_should_not_be_present/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingList_nonMergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingIntList_nonMergingIntList])/retainKeys_map_with_no_change_should_not_be_present/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#10 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#10 (0.00s) @@ -17766,12 +17799,12 @@ --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#10 (0.00s) @@ -17781,10 +17814,10 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#21 (0.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#10 (0.00s) @@ -17802,15 +17835,15 @@ --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#10 (0.01s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#10 (0.00s) @@ -17836,13 +17869,13 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#10 (0.00s) @@ -17862,7 +17895,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#10 (0.00s) @@ -17870,12 +17903,12 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#10 (0.00s) @@ -17886,7 +17919,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#10 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#10 (0.00s) @@ -17902,19 +17935,19 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#11 (0.00s) @@ -17922,7 +17955,7 @@ --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#23 (0.00s) @@ -17937,13 +17970,13 @@ --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#11 (0.00s) @@ -17952,37 +17985,37 @@ --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#11 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#11 (0.02s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#22 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#11 (0.00s) @@ -17996,7 +18029,7 @@ --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#11 (0.02s) + --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#11 (0.00s) @@ -18015,7 +18048,7 @@ --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#11 (0.00s) @@ -18026,7 +18059,7 @@ --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#11 (0.00s) @@ -18036,7 +18069,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#11 (0.00s) @@ -18046,9 +18079,9 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#11 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#11 (0.00s) @@ -18058,14 +18091,14 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#11 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#11 (0.00s) @@ -18073,7 +18106,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#11 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#11 (0.00s) @@ -18083,13 +18116,13 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#11 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#11 (0.00s) @@ -18118,17 +18151,17 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#12 (0.00s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#12 (0.01s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#12 (0.00s) @@ -18144,30 +18177,30 @@ --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#25 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#12 (0.00s) @@ -18190,7 +18223,7 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#12 (0.00s) @@ -18212,7 +18245,7 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#12 (0.00s) @@ -18224,11 +18257,11 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#12 (0.00s) @@ -18240,8 +18273,8 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#12 (0.00s) @@ -18251,7 +18284,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#12 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#12 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#12 (0.00s) @@ -18272,7 +18305,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#12 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#12 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#12 (0.00s) @@ -18284,7 +18317,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#12 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#12 (0.01s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#13 (0.00s) @@ -18295,14 +18328,14 @@ --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#13 (0.00s) @@ -18318,11 +18351,11 @@ --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#13 (0.01s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#13 (0.00s) @@ -18339,16 +18372,16 @@ --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#13 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#27 (0.01s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#13 (0.00s) @@ -18369,7 +18402,7 @@ --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#13 (0.00s) @@ -18382,9 +18415,9 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#13 (0.01s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#13 (0.00s) @@ -18406,7 +18439,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#13 (0.00s) @@ -18414,7 +18447,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#13 (0.00s) @@ -18426,7 +18459,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#13 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#13 (0.00s) @@ -18436,7 +18469,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#13 (0.00s) @@ -18450,7 +18483,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#13 (0.00s) @@ -18471,14 +18504,14 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#14 (0.02s) + --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#14 (0.00s) @@ -18486,7 +18519,7 @@ --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#29 (0.00s) @@ -18495,12 +18528,12 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#14 (0.00s) @@ -18510,7 +18543,7 @@ --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#14 (0.00s) @@ -18520,18 +18553,18 @@ --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#14 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#28 (0.00s) @@ -18542,9 +18575,9 @@ --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#14 (0.00s) @@ -18569,8 +18602,8 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#14 (0.00s) @@ -18588,7 +18621,7 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#14 (0.02s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#14 (0.00s) @@ -18616,11 +18649,11 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#14 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#14 (0.00s) @@ -18635,7 +18668,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#14 (0.00s) @@ -18645,7 +18678,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#14 (0.00s) @@ -18658,7 +18691,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#14 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#14 (0.00s) @@ -18674,13 +18707,13 @@ --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#30 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#30 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#31 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#31 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#15 (0.00s) @@ -18698,33 +18731,33 @@ --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#15 (0.02s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#30 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#30 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#31 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#31 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#31 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#15 (0.00s) @@ -18741,13 +18774,13 @@ --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#15 (0.00s) @@ -18766,7 +18799,7 @@ --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#15 (0.00s) @@ -18776,16 +18809,16 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#15 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#15 (0.00s) @@ -18810,14 +18843,14 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#15 (0.00s) @@ -18836,11 +18869,11 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#15 (0.00s) @@ -18848,8 +18881,8 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#15 (0.02s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#15 (0.01s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#16 (0.00s) @@ -18870,7 +18903,7 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#16 (0.00s) @@ -18888,21 +18921,21 @@ --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#16 (0.00s) @@ -18910,8 +18943,8 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#32 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#32 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#33 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#32 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#33 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#33 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#16 (0.00s) @@ -18919,7 +18952,7 @@ --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#16 (0.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#16 (0.00s) @@ -18939,12 +18972,12 @@ --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#16 (0.00s) @@ -18953,7 +18986,7 @@ --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#16 (0.00s) @@ -19002,14 +19035,14 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#16 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#16 (0.00s) @@ -19029,7 +19062,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#16 (0.00s) @@ -19056,17 +19089,17 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#35 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#35 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#17 (0.00s) @@ -19082,15 +19115,15 @@ --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#17 (0.02s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#17 (0.00s) @@ -19100,13 +19133,13 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#34 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#34 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#35 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#35 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#35 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#17 (0.00s) @@ -19126,13 +19159,13 @@ --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#17 (0.00s) @@ -19161,7 +19194,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#17 (0.00s) @@ -19178,7 +19211,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#17 (0.00s) @@ -19188,7 +19221,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#17 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#17 (0.00s) @@ -19201,7 +19234,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#17 (0.00s) @@ -19210,9 +19243,9 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#17 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#17 (0.00s) @@ -19235,13 +19268,13 @@ --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#18 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#36 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#36 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#37 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#37 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#37 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#18 (0.00s) @@ -19254,19 +19287,19 @@ --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#18 (0.01s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#18 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#18 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#18 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#18 (0.00s) @@ -19280,13 +19313,13 @@ --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#18 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#18 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#36 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#36 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#36 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#37 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#37 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#18 (0.00s) @@ -19305,7 +19338,7 @@ --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#18 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#18 (0.00s) @@ -19314,7 +19347,7 @@ --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#18 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#18 (0.00s) @@ -19322,7 +19355,7 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#18 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#18 (0.00s) @@ -19334,10 +19367,10 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#18 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#18 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#18 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#18 (0.00s) @@ -19376,7 +19409,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#18 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#18 (0.00s) @@ -19392,7 +19425,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#18 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#18 (0.00s) @@ -19400,11 +19433,11 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#18 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#18 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#18 (0.00s) @@ -19432,13 +19465,13 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#39 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#39 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#19 (0.00s) @@ -19448,21 +19481,21 @@ --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#19 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#19 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#19 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#19 (0.02s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#19 (0.00s) @@ -19472,10 +19505,10 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#19 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#38 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#38 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#39 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#38 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#39 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#39 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#19 (0.00s) @@ -19484,7 +19517,7 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#19 (0.00s) @@ -19499,7 +19532,7 @@ --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#19 (0.01s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#19 (0.00s) @@ -19508,7 +19541,7 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#19 (0.00s) @@ -19516,7 +19549,7 @@ --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#19 (0.00s) @@ -19525,7 +19558,7 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#19 (0.00s) @@ -19544,7 +19577,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#19 (0.00s) @@ -19554,13 +19587,13 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#19 (0.00s) @@ -19575,10 +19608,10 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#19 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#19 (0.00s) @@ -19593,7 +19626,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#19 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#19 (0.00s) @@ -19603,7 +19636,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/Struct (0.04s) + --- PASS: TestStrategicMergePatch/Struct (0.02s) --- PASS: TestStrategicMergePatch/Struct/nil_original/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/nil_original/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/nil_patch/TwoWay (0.00s) @@ -19630,7 +19663,7 @@ --- PASS: TestStrategicMergePatch/Struct/add_field_and_delete_all_fields_from_map_with_conflict/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/replace_list_of_scalars/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/replace_list_of_scalars/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Struct/replace_list_of_scalars_with_conflict/TwoWay (0.01s) + --- PASS: TestStrategicMergePatch/Struct/replace_list_of_scalars_with_conflict/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/replace_list_of_scalars_with_conflict/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/delete_all_maps_from_merging_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/delete_all_maps_from_merging_list/ThreeWay (0.00s) @@ -19640,7 +19673,7 @@ --- PASS: TestStrategicMergePatch/Struct/delete_all_maps_from_empty_merging_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/merge_empty_merging_lists/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/merge_empty_merging_lists/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Struct/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/TwoWay (0.01s) + --- PASS: TestStrategicMergePatch/Struct/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/defined_null_values_should_propagate_removing_original_fields/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/defined_null_values_should_propagate_removing_original_fields/ThreeWay (0.00s) @@ -19664,18 +19697,18 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#40 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#41 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#41 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#20 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#20 (0.00s) @@ -19691,20 +19724,20 @@ --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#20 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#20 (0.01s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#20 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#40 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#40 (0.00s) @@ -19716,7 +19749,7 @@ --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#20 (0.00s) @@ -19732,18 +19765,18 @@ --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#20 (0.01s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#20 (0.00s) @@ -19766,13 +19799,13 @@ --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#20 (0.00s) @@ -19782,7 +19815,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#20 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#20 (0.00s) @@ -19797,12 +19830,12 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#20 (0.00s) @@ -19812,7 +19845,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#20 (0.00s) @@ -19831,7 +19864,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#20 (0.00s) @@ -19840,7 +19873,7 @@ --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#21 (0.00s) @@ -19859,7 +19892,7 @@ --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#21 (0.00s) @@ -19879,13 +19912,13 @@ --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#21 (0.00s) @@ -19895,11 +19928,11 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#42 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#42 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#42 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#43 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#43 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#21 (0.00s) @@ -19907,7 +19940,7 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#21 (0.01s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#21 (0.00s) @@ -19919,12 +19952,12 @@ --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#21 (0.00s) @@ -19942,7 +19975,7 @@ --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#21 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#21 (0.00s) @@ -19950,7 +19983,7 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#21 (0.00s) @@ -19960,12 +19993,12 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#21 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#21 (0.00s) @@ -19981,7 +20014,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#21 (0.00s) @@ -19989,12 +20022,12 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#21 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#21 (0.00s) @@ -20009,7 +20042,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#21 (0.00s) @@ -20021,14 +20054,14 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#22 (0.01s) + --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#22 (0.00s) @@ -20052,13 +20085,13 @@ --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#22 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#22 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#22 (0.00s) @@ -20071,13 +20104,13 @@ --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#22 (0.02s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#22 (0.02s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#22 (0.00s) @@ -20085,13 +20118,13 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#44 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#44 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#45 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#45 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#22 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#45 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#22 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#22 (0.00s) @@ -20111,7 +20144,7 @@ --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#22 (0.01s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#22 (0.00s) @@ -20122,7 +20155,7 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#22 (0.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#22 (0.00s) @@ -20153,7 +20186,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#22 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#22 (0.00s) @@ -20169,7 +20202,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#22 (0.07s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#22 (0.00s) @@ -20181,14 +20214,14 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#22 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#22 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#22 (0.00s) @@ -20207,13 +20240,13 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#22 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#23 (0.02s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#23 (0.00s) @@ -20229,13 +20262,13 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#47 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#47 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#23 (0.02s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#23 (0.21s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#23 (0.00s) @@ -20244,22 +20277,22 @@ --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#23 (0.02s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#23 (0.00s) @@ -20271,11 +20304,11 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#46 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#46 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#46 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#47 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#47 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#47 (0.04s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#23 (0.00s) @@ -20292,14 +20325,14 @@ --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#23 (0.01s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#23 (0.02s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#23 (0.00s) @@ -20316,7 +20349,7 @@ --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#23 (0.00s) @@ -20325,7 +20358,7 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#23 (0.00s) @@ -20344,14 +20377,14 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#23 (0.00s) @@ -20359,7 +20392,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#23 (0.00s) @@ -20367,16 +20400,16 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#23 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#23 (0.00s) @@ -20387,12 +20420,12 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#23 (0.00s) @@ -20409,13 +20442,13 @@ --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#24 (0.01s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#48 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#48 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#49 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#49 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#49 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#24 (0.00s) @@ -20423,7 +20456,7 @@ --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#24 (0.02s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#24 (0.00s) @@ -20431,7 +20464,7 @@ --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#24 (0.00s) @@ -20439,7 +20472,7 @@ --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#24 (0.00s) @@ -20451,25 +20484,25 @@ --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#24 (0.02s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#48 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#48 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#48 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#49 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#49 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#49 (0.01s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#24 (0.02s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#24 (0.01s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#24 (0.00s) @@ -20478,7 +20511,7 @@ --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#24 (0.00s) @@ -20507,7 +20540,7 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#24 (0.02s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#24 (0.00s) @@ -20515,7 +20548,7 @@ --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#24 (2.75s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#24 (0.00s) @@ -20526,7 +20559,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#24 (0.02s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#24 (0.00s) @@ -20541,10 +20574,10 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#24 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#24 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#24 (0.00s) @@ -20554,7 +20587,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#24 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#24 (0.00s) @@ -20573,19 +20606,19 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#24 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#24 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#25 (0.00s) @@ -20602,23 +20635,23 @@ --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#50 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#50 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#51 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#51 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#51 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#25 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#25 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#25 (0.01s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#25 (0.00s) @@ -20629,7 +20662,7 @@ --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#25 (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#25 (0.00s) @@ -20638,19 +20671,19 @@ --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#25 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#25 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#50 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#50 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#51 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#51 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#25 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#25 (0.00s) @@ -20668,10 +20701,10 @@ --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#25 (0.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#25 (0.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#25 (0.00s) @@ -20680,7 +20713,7 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#25 (0.02s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#25 (0.00s) @@ -20701,15 +20734,15 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#25 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#25 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#25 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#25 (0.00s) @@ -20719,7 +20752,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#25 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#25 (0.00s) @@ -20738,7 +20771,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#25 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#25 (0.00s) @@ -20749,8 +20782,8 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#25 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#25 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#25 (0.00s) @@ -20769,15 +20802,15 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#25 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#25 (0.01s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#26 (0.00s) @@ -20793,17 +20826,17 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#53 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#53 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#26 (0.01s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#26 (0.00s) @@ -20823,29 +20856,29 @@ --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#26 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#52 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#52 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#52 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#52 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#53 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#53 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#26 (0.00s) @@ -20855,11 +20888,11 @@ --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#26 (0.01s) @@ -20867,7 +20900,7 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#26 (0.02s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#26 (0.00s) @@ -20875,7 +20908,7 @@ --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#26 (0.01s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#26 (0.00s) @@ -20887,7 +20920,7 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#26 (0.00s) @@ -20895,7 +20928,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#26 (0.00s) @@ -20913,17 +20946,17 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#26 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#26 (0.00s) @@ -20934,10 +20967,10 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#26 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#26 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#26 (0.00s) @@ -20945,37 +20978,37 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#26 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#26 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#27 (0.03s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#54 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#54 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#55 (0.00s) @@ -20987,12 +21020,12 @@ --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#27 (0.01s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#27 (0.00s) @@ -21001,13 +21034,13 @@ --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#27 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#27 (0.00s) @@ -21015,9 +21048,9 @@ --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#27 (0.01s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#27 (0.00s) @@ -21025,7 +21058,7 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#54 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#54 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#55 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#55 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#55 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#27 (0.00s) @@ -21045,10 +21078,10 @@ --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#27 (0.01s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#27 (0.00s) @@ -21059,7 +21092,7 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#27 (0.00s) @@ -21075,7 +21108,7 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#27 (0.00s) @@ -21091,7 +21124,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#27 (0.00s) @@ -21110,7 +21143,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#27 (0.00s) @@ -21121,7 +21154,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#27 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#27 (0.00s) @@ -21135,23 +21168,23 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#27 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#27 (0.02s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#28 (0.00s) @@ -21169,13 +21202,13 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#57 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#57 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#28 (0.01s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#28 (0.00s) @@ -21190,34 +21223,34 @@ --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#28 (0.01s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#28 (0.01s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#28 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#56 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#56 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#56 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#57 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#57 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#28 (0.02s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#28 (0.00s) @@ -21238,12 +21271,12 @@ --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#28 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#28 (0.00s) @@ -21267,11 +21300,11 @@ --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#28 (0.00s) @@ -21281,8 +21314,8 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#28 (0.00s) @@ -21302,14 +21335,14 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#28 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#28 (0.00s) @@ -21319,17 +21352,17 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#28 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#28 (0.00s) @@ -21351,16 +21384,16 @@ --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#58 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#58 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#58 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#59 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#59 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#29 (0.01s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#29 (0.00s) @@ -21378,12 +21411,12 @@ --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#29 (0.00s) @@ -21400,7 +21433,7 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#29 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#58 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#58 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#59 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#59 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#59 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#29 (0.00s) @@ -21419,7 +21452,7 @@ --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#29 (0.00s) @@ -21439,12 +21472,12 @@ --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#29 (0.00s) @@ -21452,10 +21485,10 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#29 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#29 (0.00s) @@ -21475,17 +21508,17 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#29 (0.00s) @@ -21497,7 +21530,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#29 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#29 (0.00s) @@ -21507,13 +21540,13 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#29 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#29 (0.00s) @@ -21525,213 +21558,213 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#29 (0.01s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#29 (0.00s) === RUN TestNumberConversion ---- PASS: TestNumberConversion (0.00s) +--- PASS: TestNumberConversion (0.01s) === RUN TestReplaceWithRawExtension ---- PASS: TestReplaceWithRawExtension (0.02s) +--- PASS: TestReplaceWithRawExtension (0.01s) === RUN TestUnknownField === RUN TestUnknownField/add_empty_slices === RUN TestUnknownField/add_empty_slices/struct/TwoWay === RUN TestUnknownField/add_empty_slices/struct/ThreeWay -=== RUN TestUnknownField/add_empty_slices/Kind([name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList])/TwoWay -=== RUN TestUnknownField/add_empty_slices/Kind([name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList])/ThreeWay +=== RUN TestUnknownField/add_empty_slices/Kind([name_other_mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList])/TwoWay +=== RUN TestUnknownField/add_empty_slices/Kind([name_other_mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList])/ThreeWay === RUN TestUnknownField/add_empty_slices/Struct/TwoWay === RUN TestUnknownField/add_empty_slices/Struct/ThreeWay === RUN TestUnknownField/add_only_not_nulls === RUN TestUnknownField/add_only_not_nulls/struct/TwoWay === RUN TestUnknownField/add_only_not_nulls/struct/ThreeWay -=== RUN TestUnknownField/add_only_not_nulls/Kind([replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr])/TwoWay -=== RUN TestUnknownField/add_only_not_nulls/Kind([name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList])/ThreeWay +=== RUN TestUnknownField/add_only_not_nulls/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap])/TwoWay +=== RUN TestUnknownField/add_only_not_nulls/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap])/ThreeWay === RUN TestUnknownField/add_only_not_nulls/Struct/TwoWay === RUN TestUnknownField/add_only_not_nulls/Struct/ThreeWay === RUN TestUnknownField/added_only === RUN TestUnknownField/added_only/struct/TwoWay === RUN TestUnknownField/added_only/struct/ThreeWay -=== RUN TestUnknownField/added_only/Kind([mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other])/TwoWay -=== RUN TestUnknownField/added_only/Kind([name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList])/ThreeWay +=== RUN TestUnknownField/added_only/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap])/TwoWay +=== RUN TestUnknownField/added_only/Kind([name_other_mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList])/ThreeWay === RUN TestUnknownField/added_only/Struct/TwoWay === RUN TestUnknownField/added_only/Struct/ThreeWay === RUN TestUnknownField/diff === RUN TestUnknownField/diff/struct/TwoWay === RUN TestUnknownField/diff/struct/ThreeWay -=== RUN TestUnknownField/diff/Kind([name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList])/TwoWay -=== RUN TestUnknownField/diff/Kind([mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList_nonMergingList])/ThreeWay +=== RUN TestUnknownField/diff/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap])/TwoWay +=== RUN TestUnknownField/diff/Kind([simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList])/ThreeWay === RUN TestUnknownField/diff/Struct/TwoWay === RUN TestUnknownField/diff/Struct/ThreeWay === RUN TestUnknownField/discard_if_modified_all_nulls === RUN TestUnknownField/discard_if_modified_all_nulls/struct/TwoWay === RUN TestUnknownField/discard_if_modified_all_nulls/struct/ThreeWay -=== RUN TestUnknownField/discard_if_modified_all_nulls/Kind([retainKeysMergingList_name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap])/TwoWay -=== RUN TestUnknownField/discard_if_modified_all_nulls/Kind([nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList])/ThreeWay +=== RUN TestUnknownField/discard_if_modified_all_nulls/Kind([nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList])/TwoWay +=== RUN TestUnknownField/discard_if_modified_all_nulls/Kind([name_other_mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList])/ThreeWay === RUN TestUnknownField/discard_if_modified_all_nulls/Struct/TwoWay === RUN TestUnknownField/discard_if_modified_all_nulls/Struct/ThreeWay === RUN TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls === RUN TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/struct/TwoWay === RUN TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/struct/ThreeWay -=== RUN TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/Kind([mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList_nonMergingList])/TwoWay -=== RUN TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/Kind([value_simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem])/ThreeWay +=== RUN TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap])/TwoWay +=== RUN TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/Kind([simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList])/ThreeWay === RUN TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/Struct/TwoWay === RUN TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/Struct/ThreeWay === RUN TestUnknownField/filter_if_slice_is_all_empty === RUN TestUnknownField/filter_if_slice_is_all_empty/struct/TwoWay === RUN TestUnknownField/filter_if_slice_is_all_empty/struct/ThreeWay -=== RUN TestUnknownField/filter_if_slice_is_all_empty/Kind([mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList])/TwoWay -=== RUN TestUnknownField/filter_if_slice_is_all_empty/Kind([mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other])/ThreeWay +=== RUN TestUnknownField/filter_if_slice_is_all_empty/Kind([name_other_mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList])/TwoWay +=== RUN TestUnknownField/filter_if_slice_is_all_empty/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap])/ThreeWay === RUN TestUnknownField/filter_if_slice_is_all_empty/Struct/TwoWay === RUN TestUnknownField/filter_if_slice_is_all_empty/Struct/ThreeWay === RUN TestUnknownField/filter_nulls_from_nested_slices === RUN TestUnknownField/filter_nulls_from_nested_slices/struct/TwoWay === RUN TestUnknownField/filter_nulls_from_nested_slices/struct/ThreeWay -=== RUN TestUnknownField/filter_nulls_from_nested_slices/Kind([mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList_nonMergingList])/TwoWay -=== RUN TestUnknownField/filter_nulls_from_nested_slices/Kind([simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value])/ThreeWay +=== RUN TestUnknownField/filter_nulls_from_nested_slices/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap])/TwoWay +=== RUN TestUnknownField/filter_nulls_from_nested_slices/Kind([mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other])/ThreeWay === RUN TestUnknownField/filter_nulls_from_nested_slices/Struct/TwoWay === RUN TestUnknownField/filter_nulls_from_nested_slices/Struct/ThreeWay === RUN TestUnknownField/nested_null_values_in_original_are_preserved === RUN TestUnknownField/nested_null_values_in_original_are_preserved/struct/TwoWay === RUN TestUnknownField/nested_null_values_in_original_are_preserved/struct/ThreeWay -=== RUN TestUnknownField/nested_null_values_in_original_are_preserved/Kind([nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList])/TwoWay -=== RUN TestUnknownField/nested_null_values_in_original_are_preserved/Kind([name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList])/ThreeWay +=== RUN TestUnknownField/nested_null_values_in_original_are_preserved/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap])/TwoWay +=== RUN TestUnknownField/nested_null_values_in_original_are_preserved/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap])/ThreeWay === RUN TestUnknownField/nested_null_values_in_original_are_preserved/Struct/TwoWay === RUN TestUnknownField/nested_null_values_in_original_are_preserved/Struct/ThreeWay === RUN TestUnknownField/no_diff === RUN TestUnknownField/no_diff/struct/TwoWay === RUN TestUnknownField/no_diff/struct/ThreeWay -=== RUN TestUnknownField/no_diff/Kind([mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other])/TwoWay -=== RUN TestUnknownField/no_diff/Kind([retainKeysMergingList_name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap])/ThreeWay +=== RUN TestUnknownField/no_diff/Kind([other_mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name])/TwoWay +=== RUN TestUnknownField/no_diff/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap])/ThreeWay === RUN TestUnknownField/no_diff/Struct/TwoWay === RUN TestUnknownField/no_diff/Struct/ThreeWay === RUN TestUnknownField/no_diff_even_if_modified_null === RUN TestUnknownField/no_diff_even_if_modified_null/struct/TwoWay === RUN TestUnknownField/no_diff_even_if_modified_null/struct/ThreeWay -=== RUN TestUnknownField/no_diff_even_if_modified_null/Kind([mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList])/TwoWay -=== RUN TestUnknownField/no_diff_even_if_modified_null/Kind([retainKeysMap_retainKeysMergingList_name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap])/ThreeWay +=== RUN TestUnknownField/no_diff_even_if_modified_null/Kind([mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other])/TwoWay +=== RUN TestUnknownField/no_diff_even_if_modified_null/Kind([other_mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name])/ThreeWay === RUN TestUnknownField/no_diff_even_if_modified_null/Struct/TwoWay === RUN TestUnknownField/no_diff_even_if_modified_null/Struct/ThreeWay === RUN TestUnknownField/not_filter_nulls_from_non-associative_slice === RUN TestUnknownField/not_filter_nulls_from_non-associative_slice/struct/TwoWay === RUN TestUnknownField/not_filter_nulls_from_non-associative_slice/struct/ThreeWay -=== RUN TestUnknownField/not_filter_nulls_from_non-associative_slice/Kind([simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value])/TwoWay -=== RUN TestUnknownField/not_filter_nulls_from_non-associative_slice/Kind([mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList_nonMergingList])/ThreeWay +=== RUN TestUnknownField/not_filter_nulls_from_non-associative_slice/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap])/TwoWay +=== RUN TestUnknownField/not_filter_nulls_from_non-associative_slice/Kind([replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr])/ThreeWay === RUN TestUnknownField/not_filter_nulls_from_non-associative_slice/Struct/TwoWay === RUN TestUnknownField/not_filter_nulls_from_non-associative_slice/Struct/ThreeWay === RUN TestUnknownField/null_values_in_original_are_preserved === RUN TestUnknownField/null_values_in_original_are_preserved/struct/TwoWay === RUN TestUnknownField/null_values_in_original_are_preserved/struct/ThreeWay -=== RUN TestUnknownField/null_values_in_original_are_preserved/Kind([name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList])/TwoWay -=== RUN TestUnknownField/null_values_in_original_are_preserved/Kind([mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList_nonMergingList])/ThreeWay +=== RUN TestUnknownField/null_values_in_original_are_preserved/Kind([mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other])/TwoWay +=== RUN TestUnknownField/null_values_in_original_are_preserved/Kind([other_mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name])/ThreeWay === RUN TestUnknownField/null_values_in_original_are_preserved/Struct/TwoWay === RUN TestUnknownField/null_values_in_original_are_preserved/Struct/ThreeWay === RUN TestUnknownField/removed_only === RUN TestUnknownField/removed_only/struct/TwoWay === RUN TestUnknownField/removed_only/struct/ThreeWay -=== RUN TestUnknownField/removed_only/Kind([name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList])/TwoWay -=== RUN TestUnknownField/removed_only/Kind([mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other])/ThreeWay +=== RUN TestUnknownField/removed_only/Kind([name_other_mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList])/TwoWay +=== RUN TestUnknownField/removed_only/Kind([simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList])/ThreeWay === RUN TestUnknownField/removed_only/Struct/TwoWay === RUN TestUnknownField/removed_only/Struct/ThreeWay ---- PASS: TestUnknownField (0.01s) +--- PASS: TestUnknownField (0.02s) --- PASS: TestUnknownField/add_empty_slices (0.00s) --- PASS: TestUnknownField/add_empty_slices/struct/TwoWay (0.00s) --- PASS: TestUnknownField/add_empty_slices/struct/ThreeWay (0.00s) - --- PASS: TestUnknownField/add_empty_slices/Kind([name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList])/TwoWay (0.00s) - --- PASS: TestUnknownField/add_empty_slices/Kind([name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList])/ThreeWay (0.00s) + --- PASS: TestUnknownField/add_empty_slices/Kind([name_other_mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList])/TwoWay (0.00s) + --- PASS: TestUnknownField/add_empty_slices/Kind([name_other_mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList])/ThreeWay (0.00s) --- PASS: TestUnknownField/add_empty_slices/Struct/TwoWay (0.00s) --- PASS: TestUnknownField/add_empty_slices/Struct/ThreeWay (0.00s) --- PASS: TestUnknownField/add_only_not_nulls (0.00s) --- PASS: TestUnknownField/add_only_not_nulls/struct/TwoWay (0.00s) --- PASS: TestUnknownField/add_only_not_nulls/struct/ThreeWay (0.00s) - --- PASS: TestUnknownField/add_only_not_nulls/Kind([replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr])/TwoWay (0.00s) - --- PASS: TestUnknownField/add_only_not_nulls/Kind([name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList])/ThreeWay (0.00s) + --- PASS: TestUnknownField/add_only_not_nulls/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap])/TwoWay (0.00s) + --- PASS: TestUnknownField/add_only_not_nulls/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap])/ThreeWay (0.00s) --- PASS: TestUnknownField/add_only_not_nulls/Struct/TwoWay (0.00s) --- PASS: TestUnknownField/add_only_not_nulls/Struct/ThreeWay (0.00s) --- PASS: TestUnknownField/added_only (0.00s) --- PASS: TestUnknownField/added_only/struct/TwoWay (0.00s) --- PASS: TestUnknownField/added_only/struct/ThreeWay (0.00s) - --- PASS: TestUnknownField/added_only/Kind([mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other])/TwoWay (0.00s) - --- PASS: TestUnknownField/added_only/Kind([name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList])/ThreeWay (0.00s) + --- PASS: TestUnknownField/added_only/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap])/TwoWay (0.00s) + --- PASS: TestUnknownField/added_only/Kind([name_other_mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList])/ThreeWay (0.00s) --- PASS: TestUnknownField/added_only/Struct/TwoWay (0.00s) --- PASS: TestUnknownField/added_only/Struct/ThreeWay (0.00s) --- PASS: TestUnknownField/diff (0.00s) --- PASS: TestUnknownField/diff/struct/TwoWay (0.00s) --- PASS: TestUnknownField/diff/struct/ThreeWay (0.00s) - --- PASS: TestUnknownField/diff/Kind([name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList])/TwoWay (0.00s) - --- PASS: TestUnknownField/diff/Kind([mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList_nonMergingList])/ThreeWay (0.00s) + --- PASS: TestUnknownField/diff/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap])/TwoWay (0.00s) + --- PASS: TestUnknownField/diff/Kind([simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList])/ThreeWay (0.00s) --- PASS: TestUnknownField/diff/Struct/TwoWay (0.00s) --- PASS: TestUnknownField/diff/Struct/ThreeWay (0.00s) --- PASS: TestUnknownField/discard_if_modified_all_nulls (0.00s) --- PASS: TestUnknownField/discard_if_modified_all_nulls/struct/TwoWay (0.00s) --- PASS: TestUnknownField/discard_if_modified_all_nulls/struct/ThreeWay (0.00s) - --- PASS: TestUnknownField/discard_if_modified_all_nulls/Kind([retainKeysMergingList_name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap])/TwoWay (0.00s) - --- PASS: TestUnknownField/discard_if_modified_all_nulls/Kind([nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList])/ThreeWay (0.00s) + --- PASS: TestUnknownField/discard_if_modified_all_nulls/Kind([nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList])/TwoWay (0.00s) + --- PASS: TestUnknownField/discard_if_modified_all_nulls/Kind([name_other_mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList])/ThreeWay (0.00s) --- PASS: TestUnknownField/discard_if_modified_all_nulls/Struct/TwoWay (0.00s) --- PASS: TestUnknownField/discard_if_modified_all_nulls/Struct/ThreeWay (0.00s) --- PASS: TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls (0.00s) --- PASS: TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/struct/TwoWay (0.00s) --- PASS: TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/struct/ThreeWay (0.00s) - --- PASS: TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/Kind([mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList_nonMergingList])/TwoWay (0.00s) - --- PASS: TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/Kind([value_simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem])/ThreeWay (0.00s) + --- PASS: TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap])/TwoWay (0.00s) + --- PASS: TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/Kind([simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList])/ThreeWay (0.00s) --- PASS: TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/Struct/TwoWay (0.00s) --- PASS: TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/Struct/ThreeWay (0.00s) --- PASS: TestUnknownField/filter_if_slice_is_all_empty (0.00s) --- PASS: TestUnknownField/filter_if_slice_is_all_empty/struct/TwoWay (0.00s) --- PASS: TestUnknownField/filter_if_slice_is_all_empty/struct/ThreeWay (0.00s) - --- PASS: TestUnknownField/filter_if_slice_is_all_empty/Kind([mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList])/TwoWay (0.00s) - --- PASS: TestUnknownField/filter_if_slice_is_all_empty/Kind([mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other])/ThreeWay (0.00s) + --- PASS: TestUnknownField/filter_if_slice_is_all_empty/Kind([name_other_mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList])/TwoWay (0.00s) + --- PASS: TestUnknownField/filter_if_slice_is_all_empty/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap])/ThreeWay (0.00s) --- PASS: TestUnknownField/filter_if_slice_is_all_empty/Struct/TwoWay (0.00s) --- PASS: TestUnknownField/filter_if_slice_is_all_empty/Struct/ThreeWay (0.00s) --- PASS: TestUnknownField/filter_nulls_from_nested_slices (0.00s) --- PASS: TestUnknownField/filter_nulls_from_nested_slices/struct/TwoWay (0.00s) --- PASS: TestUnknownField/filter_nulls_from_nested_slices/struct/ThreeWay (0.00s) - --- PASS: TestUnknownField/filter_nulls_from_nested_slices/Kind([mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList_nonMergingList])/TwoWay (0.00s) - --- PASS: TestUnknownField/filter_nulls_from_nested_slices/Kind([simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value])/ThreeWay (0.00s) + --- PASS: TestUnknownField/filter_nulls_from_nested_slices/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap])/TwoWay (0.00s) + --- PASS: TestUnknownField/filter_nulls_from_nested_slices/Kind([mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other])/ThreeWay (0.00s) --- PASS: TestUnknownField/filter_nulls_from_nested_slices/Struct/TwoWay (0.00s) --- PASS: TestUnknownField/filter_nulls_from_nested_slices/Struct/ThreeWay (0.00s) --- PASS: TestUnknownField/nested_null_values_in_original_are_preserved (0.00s) --- PASS: TestUnknownField/nested_null_values_in_original_are_preserved/struct/TwoWay (0.00s) --- PASS: TestUnknownField/nested_null_values_in_original_are_preserved/struct/ThreeWay (0.00s) - --- PASS: TestUnknownField/nested_null_values_in_original_are_preserved/Kind([nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList])/TwoWay (0.00s) - --- PASS: TestUnknownField/nested_null_values_in_original_are_preserved/Kind([name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList])/ThreeWay (0.00s) + --- PASS: TestUnknownField/nested_null_values_in_original_are_preserved/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap])/TwoWay (0.00s) + --- PASS: TestUnknownField/nested_null_values_in_original_are_preserved/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap])/ThreeWay (0.00s) --- PASS: TestUnknownField/nested_null_values_in_original_are_preserved/Struct/TwoWay (0.00s) --- PASS: TestUnknownField/nested_null_values_in_original_are_preserved/Struct/ThreeWay (0.00s) --- PASS: TestUnknownField/no_diff (0.00s) --- PASS: TestUnknownField/no_diff/struct/TwoWay (0.00s) --- PASS: TestUnknownField/no_diff/struct/ThreeWay (0.00s) - --- PASS: TestUnknownField/no_diff/Kind([mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other])/TwoWay (0.00s) - --- PASS: TestUnknownField/no_diff/Kind([retainKeysMergingList_name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap])/ThreeWay (0.00s) + --- PASS: TestUnknownField/no_diff/Kind([other_mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name])/TwoWay (0.00s) + --- PASS: TestUnknownField/no_diff/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap])/ThreeWay (0.00s) --- PASS: TestUnknownField/no_diff/Struct/TwoWay (0.00s) --- PASS: TestUnknownField/no_diff/Struct/ThreeWay (0.00s) --- PASS: TestUnknownField/no_diff_even_if_modified_null (0.00s) --- PASS: TestUnknownField/no_diff_even_if_modified_null/struct/TwoWay (0.00s) --- PASS: TestUnknownField/no_diff_even_if_modified_null/struct/ThreeWay (0.00s) - --- PASS: TestUnknownField/no_diff_even_if_modified_null/Kind([mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList])/TwoWay (0.00s) - --- PASS: TestUnknownField/no_diff_even_if_modified_null/Kind([retainKeysMap_retainKeysMergingList_name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap])/ThreeWay (0.00s) + --- PASS: TestUnknownField/no_diff_even_if_modified_null/Kind([mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other])/TwoWay (0.00s) + --- PASS: TestUnknownField/no_diff_even_if_modified_null/Kind([other_mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name])/ThreeWay (0.00s) --- PASS: TestUnknownField/no_diff_even_if_modified_null/Struct/TwoWay (0.00s) --- PASS: TestUnknownField/no_diff_even_if_modified_null/Struct/ThreeWay (0.00s) --- PASS: TestUnknownField/not_filter_nulls_from_non-associative_slice (0.00s) --- PASS: TestUnknownField/not_filter_nulls_from_non-associative_slice/struct/TwoWay (0.00s) --- PASS: TestUnknownField/not_filter_nulls_from_non-associative_slice/struct/ThreeWay (0.00s) - --- PASS: TestUnknownField/not_filter_nulls_from_non-associative_slice/Kind([simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value])/TwoWay (0.00s) - --- PASS: TestUnknownField/not_filter_nulls_from_non-associative_slice/Kind([mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList_nonMergingList])/ThreeWay (0.00s) + --- PASS: TestUnknownField/not_filter_nulls_from_non-associative_slice/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap])/TwoWay (0.00s) + --- PASS: TestUnknownField/not_filter_nulls_from_non-associative_slice/Kind([replacingItem_retainKeysMergingList_name_other_mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr])/ThreeWay (0.00s) --- PASS: TestUnknownField/not_filter_nulls_from_non-associative_slice/Struct/TwoWay (0.00s) --- PASS: TestUnknownField/not_filter_nulls_from_non-associative_slice/Struct/ThreeWay (0.00s) --- PASS: TestUnknownField/null_values_in_original_are_preserved (0.00s) --- PASS: TestUnknownField/null_values_in_original_are_preserved/struct/TwoWay (0.00s) --- PASS: TestUnknownField/null_values_in_original_are_preserved/struct/ThreeWay (0.00s) - --- PASS: TestUnknownField/null_values_in_original_are_preserved/Kind([name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList])/TwoWay (0.00s) - --- PASS: TestUnknownField/null_values_in_original_are_preserved/Kind([mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other_mergingList_nonMergingList])/ThreeWay (0.00s) + --- PASS: TestUnknownField/null_values_in_original_are_preserved/Kind([mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other])/TwoWay (0.00s) + --- PASS: TestUnknownField/null_values_in_original_are_preserved/Kind([other_mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name])/ThreeWay (0.00s) --- PASS: TestUnknownField/null_values_in_original_are_preserved/Struct/TwoWay (0.00s) --- PASS: TestUnknownField/null_values_in_original_are_preserved/Struct/ThreeWay (0.00s) --- PASS: TestUnknownField/removed_only (0.00s) --- PASS: TestUnknownField/removed_only/struct/TwoWay (0.00s) --- PASS: TestUnknownField/removed_only/struct/ThreeWay (0.00s) - --- PASS: TestUnknownField/removed_only/Kind([name_other_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList])/TwoWay (0.00s) - --- PASS: TestUnknownField/removed_only/Kind([mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_value_simpleMap_retainKeysMap_retainKeysMergingList_name_other])/ThreeWay (0.00s) + --- PASS: TestUnknownField/removed_only/Kind([name_other_mergingList_simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList])/TwoWay (0.00s) + --- PASS: TestUnknownField/removed_only/Kind([simpleMap_retainKeysMap_value_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_other_mergingList])/ThreeWay (0.00s) --- PASS: TestUnknownField/removed_only/Struct/TwoWay (0.00s) --- PASS: TestUnknownField/removed_only/Struct/ThreeWay (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/strategicpatch 10.519s +ok k8s.io/apimachinery/pkg/util/strategicpatch 8.764s ? k8s.io/apimachinery/pkg/util/strategicpatch/testing [no test files] ? k8s.io/apimachinery/pkg/util/uuid [no test files] === RUN TestIsDNS1123Label @@ -21867,13 +21900,13 @@ === RUN TestIsRelaxedEnvVarName --- PASS: TestIsRelaxedEnvVarName (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/validation 0.036s +ok k8s.io/apimachinery/pkg/util/validation 0.028s === RUN TestMakeFuncs --- PASS: TestMakeFuncs (0.00s) === RUN TestErrorUsefulMessage errors_test.go:67: message: : Invalid value: "null" errors_test.go:74: message: foo: Invalid value: "bar": deet - errors_test.go:97: message: foo: Invalid value: field.complicated{Baz:1, Qux:"aoeu", Inner:(*field.complicated)(0xc0001291a0), KV:map[string]int{"Billy":2}}: detail + errors_test.go:97: message: foo: Invalid value: field.complicated{Baz:1, Qux:"aoeu", Inner:(*field.complicated)(0xc0001263c0), KV:map[string]int{"Billy":2}}: detail --- PASS: TestErrorUsefulMessage (0.00s) === RUN TestToAggregate --- PASS: TestToAggregate (0.00s) @@ -21886,7 +21919,7 @@ === RUN TestPathMultiArg --- PASS: TestPathMultiArg (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/validation/field 0.040s +ok k8s.io/apimachinery/pkg/util/validation/field 0.012s === RUN TestSemanticVersions --- PASS: TestSemanticVersions (0.00s) === RUN TestBadSemanticVersions @@ -21904,7 +21937,7 @@ === RUN TestParse --- PASS: TestParse (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/version 0.044s +ok k8s.io/apimachinery/pkg/util/version 0.022s === RUN TestInterrupted === RUN TestInterrupted/#00 === RUN TestInterrupted/#01 @@ -21958,7 +21991,7 @@ === RUN Test_loopConditionUntilContext_semantic/context_canceled_before_the_second_execution_and_immediate === RUN Test_loopConditionUntilContext_semantic/immediate_and_long_duration_of_condition_and_sliding_false === RUN Test_loopConditionUntilContext_semantic/immediate_and_long_duration_of_condition_and_sliding_true ---- PASS: Test_loopConditionUntilContext_semantic (2.64s) +--- PASS: Test_loopConditionUntilContext_semantic (2.61s) --- PASS: Test_loopConditionUntilContext_semantic/condition_successful_is_only_one_attempt (0.00s) --- PASS: Test_loopConditionUntilContext_semantic/delayed_condition_successful_causes_return_and_attempts (0.00s) --- PASS: Test_loopConditionUntilContext_semantic/delayed_condition_successful_causes_return_and_attempts_many_times (0.00s) @@ -21970,11 +22003,11 @@ --- PASS: Test_loopConditionUntilContext_semantic/context_already_canceled_and_immediate_1_attempt_expected (0.00s) --- PASS: Test_loopConditionUntilContext_semantic/context_cancelled_after_5_attempts (0.00s) --- PASS: Test_loopConditionUntilContext_semantic/context_cancelled_and_immediate_after_5_attempts (0.00s) - --- PASS: Test_loopConditionUntilContext_semantic/context_at_deadline_and_immediate_1_attempt_expected (0.01s) - --- PASS: Test_loopConditionUntilContext_semantic/context_at_deadline_no_attempts_expected (0.01s) + --- PASS: Test_loopConditionUntilContext_semantic/context_at_deadline_and_immediate_1_attempt_expected (0.00s) + --- PASS: Test_loopConditionUntilContext_semantic/context_at_deadline_no_attempts_expected (0.00s) --- PASS: Test_loopConditionUntilContext_semantic/context_canceled_before_the_second_execution_and_immediate (1.00s) --- PASS: Test_loopConditionUntilContext_semantic/immediate_and_long_duration_of_condition_and_sliding_false (0.60s) - --- PASS: Test_loopConditionUntilContext_semantic/immediate_and_long_duration_of_condition_and_sliding_true (1.02s) + --- PASS: Test_loopConditionUntilContext_semantic/immediate_and_long_duration_of_condition_and_sliding_true (1.00s) === RUN Test_loopConditionUntilContext_timings === RUN Test_loopConditionUntilContext_timings/condition_success/sliding=false/immediate=false === RUN Test_loopConditionUntilContext_timings/condition_success_and_immediate/sliding=false/immediate=true @@ -21985,15 +22018,13 @@ --- PASS: Test_loopConditionUntilContext_timings/condition_success_and_sliding/sliding=true/immediate=false (0.00s) === RUN Test_loopConditionUntilContext_Elapsed === RUN Test_loopConditionUntilContext_Elapsed/variable_timer_with_jitter -=== NAME Test_loopConditionUntilContext_Elapsed - loop_test.go:503: elapsed duration 39.53848ms > expected max duration 30ms === RUN Test_loopConditionUntilContext_Elapsed/fixed_timer === NAME Test_loopConditionUntilContext_Elapsed - loop_test.go:503: elapsed duration 35.776022ms > expected max duration 20ms + loop_test.go:503: elapsed duration 22.940988ms > expected max duration 20ms === RUN Test_loopConditionUntilContext_Elapsed/no-op_timer ---- PASS: Test_loopConditionUntilContext_Elapsed (0.08s) - --- PASS: Test_loopConditionUntilContext_Elapsed/variable_timer_with_jitter (0.04s) - --- PASS: Test_loopConditionUntilContext_Elapsed/fixed_timer (0.04s) +--- PASS: Test_loopConditionUntilContext_Elapsed (0.05s) + --- PASS: Test_loopConditionUntilContext_Elapsed/variable_timer_with_jitter (0.02s) + --- PASS: Test_loopConditionUntilContext_Elapsed/fixed_timer (0.02s) --- PASS: Test_loopConditionUntilContext_Elapsed/no-op_timer (0.00s) === RUN TestUntil --- PASS: TestUntil (0.00s) @@ -22012,9 +22043,9 @@ === RUN TestJitterUntilReturnsImmediately --- PASS: TestJitterUntilReturnsImmediately (0.00s) === RUN TestJitterUntilRecoversPanic ---- PASS: TestJitterUntilRecoversPanic (0.01s) +--- PASS: TestJitterUntilRecoversPanic (0.00s) === RUN TestJitterUntilNegativeFactor ---- PASS: TestJitterUntilNegativeFactor (1.01s) +--- PASS: TestJitterUntilNegativeFactor (1.00s) === RUN TestExponentialBackoff --- PASS: TestExponentialBackoff (0.00s) === RUN TestPoller @@ -22028,7 +22059,7 @@ === RUN TestPollImmediateError --- PASS: TestPollImmediateError (0.00s) === RUN TestPollForever ---- PASS: TestPollForever (0.01s) +--- PASS: TestPollForever (0.00s) === RUN Test_waitFor --- PASS: Test_waitFor (0.00s) === RUN Test_waitForWithEarlyClosing_waitFunc @@ -22036,9 +22067,9 @@ === RUN Test_waitForWithClosedChannel --- PASS: Test_waitForWithClosedChannel (0.00s) === RUN Test_waitForWithContextCancelsContext ---- PASS: Test_waitForWithContextCancelsContext (0.02s) +--- PASS: Test_waitForWithContextCancelsContext (0.01s) === RUN TestPollUntil ---- PASS: TestPollUntil (0.01s) +--- PASS: TestPollUntil (0.00s) === RUN TestBackoff_Step === RUN TestBackoff_Step/(*wait.Backoff)(nil)_seed=0 wait_test.go:688: [0]=0s @@ -22240,7 +22271,7 @@ wait_test.go:688: [3]=38.327888962s wait_test.go:688: [4]=37.321682252s wait_test.go:688: [5]=1m31.78531822s ---- PASS: TestBackoff_Step (0.01s) +--- PASS: TestBackoff_Step (0.00s) --- PASS: TestBackoff_Step/(*wait.Backoff)(nil)_seed=0 (0.00s) --- PASS: TestBackoff_Step/&wait.Backoff{Duration:1000000000,_Factor:0,_Jitter:0,_Steps:-1,_Cap:0}_seed=0 (0.00s) --- PASS: TestBackoff_Step/&wait.Backoff{Duration:1000000000,_Factor:0,_Jitter:0,_Steps:0,_Cap:0}_seed=0 (0.00s) @@ -22293,9 +22324,9 @@ === RUN TestJitteredBackoffManagerGetNextBackoff --- PASS: TestJitteredBackoffManagerGetNextBackoff (0.00s) === RUN TestJitterBackoffManagerWithRealClock ---- PASS: TestJitterBackoffManagerWithRealClock (0.02s) +--- PASS: TestJitterBackoffManagerWithRealClock (0.01s) === RUN TestExponentialBackoffManagerWithRealClock ---- PASS: TestExponentialBackoffManagerWithRealClock (0.07s) +--- PASS: TestExponentialBackoffManagerWithRealClock (0.05s) === RUN TestBackoffDelayWithResetExponential --- PASS: TestBackoffDelayWithResetExponential (0.00s) === RUN TestBackoffDelayWithResetEmpty @@ -22303,9 +22334,9 @@ === RUN TestBackoffDelayWithResetJitter --- PASS: TestBackoffDelayWithResetJitter (0.00s) === RUN TestBackoffDelayWithResetWithRealClockJitter ---- PASS: TestBackoffDelayWithResetWithRealClockJitter (0.02s) +--- PASS: TestBackoffDelayWithResetWithRealClockJitter (0.01s) === RUN TestBackoffDelayWithResetWithRealClockExponential ---- PASS: TestBackoffDelayWithResetWithRealClockExponential (0.06s) +--- PASS: TestBackoffDelayWithResetWithRealClockExponential (0.05s) === RUN TestExponentialBackoffWithContext === RUN TestExponentialBackoffWithContext/no_attempts_expected_with_zero_backoff_steps === RUN TestExponentialBackoffWithContext/condition_returns_false_with_single_backoff_step @@ -22323,7 +22354,7 @@ === RUN TestExponentialBackoffWithContext/condition_returns_error_no_further_attempts_expected#01 === RUN TestExponentialBackoffWithContext/context_already_canceled_no_attempts_expected#01 === RUN TestExponentialBackoffWithContext/context_at_deadline_no_attempts_expected#01 ---- PASS: TestExponentialBackoffWithContext (0.01s) +--- PASS: TestExponentialBackoffWithContext (0.00s) --- PASS: TestExponentialBackoffWithContext/no_attempts_expected_with_zero_backoff_steps (0.00s) --- PASS: TestExponentialBackoffWithContext/condition_returns_false_with_single_backoff_step (0.00s) --- PASS: TestExponentialBackoffWithContext/condition_returns_true_with_single_backoff_step (0.00s) @@ -22346,12 +22377,12 @@ === RUN TestPollImmediateUntilWithContext/condition_returns_done=false_on_immediate_attempt,_context_is_already_cancelled,_no_retry_is_attempted === RUN TestPollImmediateUntilWithContext/condition_returns_done=false_on_immediate_attempt,_context_is_not_cancelled,_retry_is_attempted === RUN TestPollImmediateUntilWithContext/condition_always_returns_done=false,_context_gets_cancelled_after_N_attempts ---- PASS: TestPollImmediateUntilWithContext (0.02s) +--- PASS: TestPollImmediateUntilWithContext (0.01s) --- PASS: TestPollImmediateUntilWithContext/condition_throws_error_on_immediate_attempt,_no_retry_is_attempted (0.00s) --- PASS: TestPollImmediateUntilWithContext/condition_returns_done=true_on_immediate_attempt,_no_retry_is_attempted (0.00s) --- PASS: TestPollImmediateUntilWithContext/condition_returns_done=false_on_immediate_attempt,_context_is_already_cancelled,_no_retry_is_attempted (0.00s) - --- PASS: TestPollImmediateUntilWithContext/condition_returns_done=false_on_immediate_attempt,_context_is_not_cancelled,_retry_is_attempted (0.01s) - --- PASS: TestPollImmediateUntilWithContext/condition_always_returns_done=false,_context_gets_cancelled_after_N_attempts (0.01s) + --- PASS: TestPollImmediateUntilWithContext/condition_returns_done=false_on_immediate_attempt,_context_is_not_cancelled,_retry_is_attempted (0.00s) + --- PASS: TestPollImmediateUntilWithContext/condition_always_returns_done=false,_context_gets_cancelled_after_N_attempts (0.00s) === RUN Test_waitForWithContext === RUN Test_waitForWithContext/condition_returns_done=true_on_first_attempt,_no_retry_is_attempted === RUN Test_waitForWithContext/condition_always_returns_done=false,_timeout_error_expected @@ -22389,25 +22420,25 @@ --- PASS: Test_poll/context_is_cancelled_after_N_attempts,_timeout_error_expected (0.00s) --- PASS: Test_poll/context_is_cancelled_after_N_attempts,_context_error_not_expected_(legacy_behavior) (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/wait 4.016s +ok k8s.io/apimachinery/pkg/util/wait 3.830s === RUN TestRateLimitedSafeWaitGroup --- PASS: TestRateLimitedSafeWaitGroup (2.13s) === RUN TestRateLimitedSafeWaitGroupWithHardTimeout --- PASS: TestRateLimitedSafeWaitGroupWithHardTimeout (0.00s) === RUN TestRateLimitedSafeWaitGroupWithBurstOfOne - ratelimited_waitgroup_test.go:247: Wait starting, N=200, grace: 5s, at: 2025-03-01 23:23:41.560624296 +0000 UTC m=+2.130065363 - ratelimited_waitgroup_test.go:255: Wait finished, count(before): 200, count(after): 0, took: 4.980000485s, err: + ratelimited_waitgroup_test.go:247: Wait starting, N=200, grace: 5s, at: 2026-04-04 05:52:55.795791517 +0000 UTC m=+2.129251105 + ratelimited_waitgroup_test.go:255: Wait finished, count(before): 200, count(after): 0, took: 4.976205487s, err: --- PASS: TestRateLimitedSafeWaitGroupWithBurstOfOne (4.98s) === RUN TestWaitGroup --- PASS: TestWaitGroup (0.00s) === RUN TestWaitGroupAddFail --- PASS: TestWaitGroupAddFail (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/waitgroup 7.164s +ok k8s.io/apimachinery/pkg/util/waitgroup 7.737s === RUN TestYAMLDecoderReadBytesLength --- PASS: TestYAMLDecoderReadBytesLength (0.00s) === RUN TestBigYAML ---- PASS: TestBigYAML (0.16s) +--- PASS: TestBigYAML (0.09s) === RUN TestYAMLDecoderCallsAfterErrShortBufferRestOfFrame --- PASS: TestYAMLDecoderCallsAfterErrShortBufferRestOfFrame (0.00s) === RUN TestSplitYAMLDocument @@ -22420,7 +22451,7 @@ decoder_test.go:178: scan: --- PASS: TestScanYAML (0.00s) === RUN TestDecodeYAML ---- PASS: TestDecodeYAML (0.00s) +--- PASS: TestDecodeYAML (0.01s) === RUN TestDecodeYAMLSeparatorValidation --- PASS: TestDecodeYAMLSeparatorValidation (0.00s) === RUN TestDecodeBrokenYAML @@ -22431,15 +22462,15 @@ === RUN TestYAMLOrJSONDecoder --- PASS: TestYAMLOrJSONDecoder (0.00s) === RUN TestReadSingleLongLine ---- PASS: TestReadSingleLongLine (0.02s) +--- PASS: TestReadSingleLongLine (0.00s) === RUN TestReadRandomLineLengths ---- PASS: TestReadRandomLineLengths (0.91s) +--- PASS: TestReadRandomLineLengths (0.40s) === RUN TestTypedJSONOrYamlErrors --- PASS: TestTypedJSONOrYamlErrors (0.00s) === RUN TestUnmarshal --- PASS: TestUnmarshal (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/yaml 1.128s +ok k8s.io/apimachinery/pkg/util/yaml 0.513s === RUN TestCompareKubeAwareVersionStrings --- PASS: TestCompareKubeAwareVersionStrings (0.00s) === RUN Test_parseKubeVersion @@ -22455,7 +22486,7 @@ --- PASS: Test_parseKubeVersion/beta_version (0.00s) --- PASS: Test_parseKubeVersion/ga_version (0.00s) PASS -ok k8s.io/apimachinery/pkg/version 0.028s +ok k8s.io/apimachinery/pkg/version 0.029s === RUN TestBroadcaster mux_test.go:86: Sending 0 mux_test.go:86: Sending 1 @@ -22488,7 +22519,7 @@ === RUN TestBroadcasterShutdownRace mux_test.go:268: Stopping Watchers mux_test.go:268: Stopping Watchers ---- PASS: TestBroadcasterShutdownRace (0.01s) +--- PASS: TestBroadcasterShutdownRace (0.00s) === RUN TestFilter --- PASS: TestFilter (0.00s) === RUN TestFilterStop @@ -22500,7 +22531,7 @@ === RUN TestStreamWatcherError --- PASS: TestStreamWatcherError (0.00s) === RUN TestStreamWatcherRace ---- PASS: TestStreamWatcherRace (0.03s) +--- PASS: TestStreamWatcherRace (0.02s) === RUN TestFake --- PASS: TestFake (0.00s) === RUN TestRaceFreeFake @@ -22510,18 +22541,18 @@ === RUN TestProxyWatcher --- PASS: TestProxyWatcher (0.00s) PASS -ok k8s.io/apimachinery/pkg/watch 0.075s +ok k8s.io/apimachinery/pkg/watch 0.043s === RUN TestLookupPtrToStruct --- PASS: TestLookupPtrToStruct (0.00s) PASS -ok k8s.io/apimachinery/third_party/forked/golang/json 0.040s +ok k8s.io/apimachinery/third_party/forked/golang/json 0.020s ? k8s.io/apimachinery/third_party/forked/golang/netutil [no test files] === RUN TestEqualities --- PASS: TestEqualities (0.00s) === RUN TestDerivatives --- PASS: TestDerivatives (0.00s) PASS -ok k8s.io/apimachinery/third_party/forked/golang/reflect 0.044s +ok k8s.io/apimachinery/third_party/forked/golang/reflect 0.015s create-stamp debian/debhelper-build-stamp dh_testroot -O--builddirectory=_build -O--buildsystem=golang dh_prep -O--builddirectory=_build -O--buildsystem=golang @@ -22548,12 +22579,14 @@ dpkg-buildpackage: info: binary-only upload (no source included) dpkg-genchanges: info: including full source code in upload I: copying local configuration +I: user script /srv/workspace/pbuilder/799826/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/799826/tmp/hooks/B01_cleanup finished I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem I: cleaning the build env -I: removing directory /srv/workspace/pbuilder/4065331 and its subdirectories -I: Current time: Sat Mar 1 11:24:38 -12 2025 -I: pbuilder-time-stamp: 1740871478 +I: removing directory /srv/workspace/pbuilder/799826 and its subdirectories +I: Current time: Sat Apr 4 19:53:50 +14 2026 +I: pbuilder-time-stamp: 1775282030