Diff of the two buildlogs: -- --- b1/build.log 2024-05-18 08:12:57.867519931 +0000 +++ b2/build.log 2024-05-18 08:23:44.620028194 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Fri May 17 20:00:42 -12 2024 -I: pbuilder-time-stamp: 1716019242 +I: Current time: Sat May 18 22:13:08 +14 2024 +I: pbuilder-time-stamp: 1716019988 I: Building the build Environment I: extracting base tarball [/var/cache/pbuilder/unstable-reproducible-base.tgz] I: copying local configuration @@ -26,52 +26,84 @@ dpkg-source: info: unpacking golang-k8s-apimachinery_0.29.0-2.debian.tar.xz I: Not using root during the build. I: Installing the build-deps -I: user script /srv/workspace/pbuilder/29243/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/4210/tmp/hooks/D01_modify_environment starting +debug: Running on virt32z. +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 May 18 08:13 /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/4210/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/4210/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='armhf' - DEBIAN_FRONTEND='noninteractive' - DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=3 ' - DISTRIBUTION='unstable' - HOME='/root' - HOST_ARCH='armhf' + 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]="21" [3]="1" [4]="release" [5]="arm-unknown-linux-gnueabihf") + BASH_VERSION='5.2.21(1)-release' + BUILDDIR=/build/reproducible-path + BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other' + BUILDUSERNAME=pbuilder2 + BUILD_ARCH=armhf + DEBIAN_FRONTEND=noninteractive + DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=4 ' + DIRSTACK=() + DISTRIBUTION=unstable + EUID=0 + FUNCNAME=([0]="Echo" [1]="main") + GROUPS=() + HOME=/root + HOSTNAME=i-capture-the-hostname + HOSTTYPE=arm + HOST_ARCH=armhf IFS=' ' - INVOCATION_ID='02306982f6af4220aaaba31d2d51ec18' - 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='29243' - PS1='# ' - PS2='> ' + INVOCATION_ID=66531a191df044eeaf4298a82d75ca8f + LANG=C + LANGUAGE=it_CH:it + LC_ALL=C + MACHTYPE=arm-unknown-linux-gnueabihf + MAIL=/var/mail/root + OPTERR=1 + OPTIND=1 + OSTYPE=linux-gnueabihf + 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=4210 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.rDd8Fyyw/pbuilderrc_fnWj --distribution unstable --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/unstable-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.rDd8Fyyw/b1 --logfile b1/build.log golang-k8s-apimachinery_0.29.0-2.dsc' - SUDO_GID='113' - SUDO_UID='107' - SUDO_USER='jenkins' - TERM='unknown' - TZ='/usr/share/zoneinfo/Etc/GMT+12' - USER='root' - _='/usr/bin/systemd-run' - http_proxy='http://10.0.0.15:3142/' + 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.rDd8Fyyw/pbuilderrc_hn6n --distribution unstable --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/unstable-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.rDd8Fyyw/b2 --logfile b2/build.log golang-k8s-apimachinery_0.29.0-2.dsc' + SUDO_GID=110 + SUDO_UID=103 + SUDO_USER=jenkins + TERM=unknown + TZ=/usr/share/zoneinfo/Etc/GMT-14 + UID=0 + USER=root + _='I: set' + http_proxy=http://10.0.0.15:3142/ I: uname -a - Linux virt64b 6.1.0-21-arm64 #1 SMP Debian 6.1.90-1 (2024-05-03) aarch64 GNU/Linux + Linux i-capture-the-hostname 6.1.0-21-armmp-lpae #1 SMP Debian 6.1.90-1 (2024-05-03) armv7l GNU/Linux I: ls -l /bin - lrwxrwxrwx 1 root root 7 May 17 07:43 /bin -> usr/bin -I: user script /srv/workspace/pbuilder/29243/tmp/hooks/D02_print_environment finished + lrwxrwxrwx 1 root root 7 May 18 07:44 /bin -> usr/bin +I: user script /srv/workspace/pbuilder/4210/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 unstable/main armhf golang-k8s-sigs-structured-merge-diff-dev all 4.4.1+ds1-1 [152 kB] Get: 113 http://deb.debian.org/debian unstable/main armhf golang-k8s-utils-dev all 0.0~git20240502.fe8a2dd-1 [89.2 kB] Get: 114 http://deb.debian.org/debian unstable/main armhf golang-k8s-kube-openapi-dev all 0.0~git20231214.ab13479-3 [1012 kB] -Fetched 77.7 MB in 2s (46.9 MB/s) +Fetched 77.7 MB in 2s (42.2 MB/s) debconf: delaying package configuration, since apt-utils is not installed 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 ... 19464 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.29.0/ && 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.29.0-2_source.changes +I: user script /srv/workspace/pbuilder/4210/tmp/hooks/A99_set_merged_usr starting +Not re-configuring usrmerge for unstable +I: user script /srv/workspace/pbuilder/4210/tmp/hooks/A99_set_merged_usr finished +hostname: Name or service not known +I: Running cd /build/reproducible-path/golang-k8s-apimachinery-0.29.0/ && 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.29.0-2_source.changes dpkg-buildpackage: info: source package golang-k8s-apimachinery dpkg-buildpackage: info: source version 0.29.0-2 dpkg-buildpackage: info: source distribution unstable @@ -759,18 +795,18 @@ 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 3 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/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/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 install -trimpath -v -p 4 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/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/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/unsafeheader -k8s.io/apimachinery internal/goarch +k8s.io/apimachinery +internal/abi internal/coverage/rtcov internal/cpu -internal/abi internal/chacha8rand -internal/bytealg internal/godebugs internal/goexperiment internal/goos +internal/bytealg runtime/internal/atomic runtime/internal/math runtime/internal/sys @@ -779,14 +815,14 @@ math/bits unicode/utf8 internal/race -math sync/atomic -runtime +math unicode cmp slices encoding unicode/utf16 +runtime log/internal container/list crypto/internal/alias @@ -797,214 +833,255 @@ k8s.io/apimachinery/pkg/selection k8s.io/utils/strings/slices k8s.io/apimachinery/pkg/types -github.com/google/go-cmp/cmp/internal/flags golang.org/x/net/html/atom google.golang.org/protobuf/internal/flags +github.com/google/go-cmp/cmp/internal/flags google.golang.org/protobuf/internal/set github.com/onsi/ginkgo/v2/config internal/reflectlite k8s.io/klog/internal/dbg -sync crypto/subtle +sync internal/testlog -runtime/cgo internal/bisect +runtime/cgo +internal/singleflight errors +internal/godebug strconv sort io -reflect internal/oserror syscall +internal/safefilepath +path +reflect +bytes +strings +bufio internal/syscall/unix time -internal/fmtsort -internal/safefilepath internal/syscall/execenv -path +regexp/syntax +go/build/constraint +k8s.io/apimachinery/pkg/util/sets +regexp internal/poll io/fs -bytes -encoding/binary -strings +context +internal/fmtsort os +encoding/binary +k8s.io/klog/internal/severity +k8s.io/klog/internal/clock +github.com/go-logr/logr +hash +crypto/internal/randutil +hash/crc32 +crypto +math/rand +crypto/internal/nistec/fiat encoding/base64 -k8s.io/apimachinery/pkg/util/sets -bufio -regexp/syntax +crypto/cipher +crypto/internal/edwards25519/field fmt path/filepath -regexp +internal/lazyregexp +k8s.io/klog/internal/buffer +crypto/internal/boring +crypto/des +crypto/aes +crypto/sha512 +crypto/internal/edwards25519 +crypto/hmac +crypto/md5 encoding/json log go/token go/doc/comment go/scanner go/ast -internal/lazyregexp -github.com/gogo/protobuf/proto -go/build/constraint k8s.io/apimachinery/third_party/forked/golang/reflect -go/doc -go/internal/typeparams -go/parser k8s.io/apimachinery/pkg/conversion +github.com/gogo/protobuf/proto net/url k8s.io/apimachinery/pkg/util/errors +go/doc +go/internal/typeparams k8s.io/apimachinery/pkg/conversion/queryparams +go/parser sigs.k8s.io/json/internal/golang/encoding/json runtime/debug k8s.io/apimachinery/pkg/util/naming -context flag -github.com/go-logr/logr -sigs.k8s.io/json -k8s.io/klog/internal/severity -k8s.io/klog/internal/buffer -k8s.io/apimachinery/pkg/util/json -k8s.io/klog/internal/clock k8s.io/klog/internal/serialize os/user +sigs.k8s.io/json +k8s.io/apimachinery/pkg/util/json compress/flate -hash -hash/crc32 -compress/gzip -crypto -crypto/cipher -crypto/internal/boring -crypto/internal/randutil -internal/godebug -math/rand math/big -k8s.io/apimachinery/pkg/runtime/schema -k8s.io/klog -crypto/aes -crypto/des -crypto/internal/edwards25519/field -crypto/sha512 -crypto/internal/nistec/fiat -crypto/internal/edwards25519 -crypto/hmac -crypto/md5 -crypto/rc4 +compress/gzip +crypto/internal/nistec +crypto/ecdh crypto/rand +crypto/elliptic crypto/internal/bigmod +k8s.io/klog crypto/internal/boring/bbig encoding/asn1 crypto/ed25519 +crypto/rc4 crypto/rsa crypto/sha1 -crypto/sha256 vendor/golang.org/x/crypto/cryptobyte +crypto/sha256 crypto/dsa encoding/hex -crypto/x509/pkix encoding/pem +crypto/x509/pkix +crypto/ecdsa vendor/golang.org/x/net/dns/dnsmessage -internal/singleflight +k8s.io/apimachinery/pkg/runtime/schema internal/intern net/netip -crypto/internal/nistec vendor/golang.org/x/crypto/chacha20 -net vendor/golang.org/x/crypto/internal/poly1305 -vendor/golang.org/x/crypto/chacha20poly1305 -crypto/ecdh -crypto/elliptic vendor/golang.org/x/crypto/hkdf vendor/golang.org/x/text/transform +vendor/golang.org/x/crypto/chacha20poly1305 vendor/golang.org/x/text/unicode/bidi -crypto/ecdsa -vendor/golang.org/x/text/unicode/norm -vendor/golang.org/x/text/secure/bidirule vendor/golang.org/x/net/http2/hpack +vendor/golang.org/x/text/unicode/norm +net mime -vendor/golang.org/x/net/idna +vendor/golang.org/x/text/secure/bidirule mime/quotedprintable net/http/internal net/http/internal/ascii io/ioutil -github.com/modern-go/concurrent github.com/modern-go/reflect2 +github.com/modern-go/concurrent gopkg.in/yaml.v2 -github.com/json-iterator/go +vendor/golang.org/x/net/idna k8s.io/apimachinery/pkg/util/framer -sigs.k8s.io/yaml -k8s.io/apimachinery/pkg/util/yaml github.com/gogo/protobuf/sortkeys github.com/google/gofuzz/bytesource github.com/google/gofuzz +github.com/json-iterator/go gopkg.in/inf.v0 +sigs.k8s.io/yaml k8s.io/apimachinery/pkg/api/resource -crypto/x509 -net/textproto -vendor/golang.org/x/net/http/httpproxy -vendor/golang.org/x/net/http/httpguts -mime/multipart -sigs.k8s.io/structured-merge-diff/value +k8s.io/apimachinery/pkg/util/yaml k8s.io/apimachinery/pkg/fields k8s.io/apimachinery/pkg/util/validation/field -k8s.io/utils/internal/third_party/forked/golang/net -k8s.io/utils/net -crypto/tls k8s.io/apimachinery/pkg/util/intstr -k8s.io/apimachinery/pkg/util/validation -k8s.io/apimachinery/pkg/labels golang.org/x/text/transform golang.org/x/text/unicode/bidi golang.org/x/text/unicode/norm golang.org/x/text/secure/bidirule golang.org/x/net/http2/hpack github.com/golang/protobuf/proto +sigs.k8s.io/structured-merge-diff/value golang.org/x/net/idna -golang.org/x/net/http/httpguts github.com/google/go-cmp/cmp/internal/diff github.com/google/go-cmp/cmp/internal/function github.com/google/go-cmp/cmp/internal/value -github.com/google/go-cmp/cmp -net/http/httptrace -net/http encoding/csv -github.com/spf13/pflag +github.com/google/go-cmp/cmp github.com/davecgh/go-spew/spew k8s.io/apimachinery/pkg/util/dump os/exec internal/sysinfo +crypto/x509 +net/textproto +vendor/golang.org/x/net/http/httpproxy +k8s.io/utils/internal/third_party/forked/golang/net +vendor/golang.org/x/net/http/httpguts +mime/multipart +k8s.io/utils/net +golang.org/x/net/http/httpguts +github.com/spf13/pflag +k8s.io/apimachinery/pkg/util/validation runtime/trace testing +k8s.io/apimachinery/pkg/labels k8s.io/apimachinery/pkg/util/duration k8s.io/apimachinery/pkg/api/validation/path container/heap k8s.io/utils/clock +crypto/tls k8s.io/apimachinery/pkg/util/cache text/tabwriter k8s.io/apimachinery/pkg/util/diff hash/adler32 -compress/zlib golang.org/x/net/internal/socks +compress/zlib +golang.org/x/net/proxy github.com/mxk/go-flowrate/flowrate golang.org/x/net/html -golang.org/x/net/proxy k8s.io/apimachinery/third_party/forked/golang/netutil github.com/pkg/errors -github.com/evanphx/json-patch k8s.io/apimachinery/pkg/util/mergepatch -k8s.io/apimachinery/pkg/util/jsonmergepatch hash/fnv +github.com/evanphx/json-patch google.golang.org/protobuf/internal/detrand google.golang.org/protobuf/internal/errors google.golang.org/protobuf/encoding/protowire +k8s.io/apimachinery/pkg/util/jsonmergepatch google.golang.org/protobuf/internal/pragma -embed google.golang.org/protobuf/reflect/protoreflect +embed google.golang.org/protobuf/internal/editiondefaults google.golang.org/protobuf/internal/version gopkg.in/yaml.v3 +github.com/PuerkitoBio/urlesc +golang.org/x/text/width google.golang.org/protobuf/internal/encoding/messageset google.golang.org/protobuf/internal/genid google.golang.org/protobuf/internal/order google.golang.org/protobuf/internal/strs google.golang.org/protobuf/reflect/protoregistry +google.golang.org/protobuf/runtime/protoiface +google.golang.org/protobuf/internal/descfmt +google.golang.org/protobuf/proto +google.golang.org/protobuf/internal/descopts +google.golang.org/protobuf/internal/encoding/text +github.com/PuerkitoBio/purell +net/http/httptrace +google.golang.org/protobuf/internal/encoding/defval +google.golang.org/protobuf/encoding/prototext +net/http +google.golang.org/protobuf/internal/filedesc +github.com/google/gnostic-models/jsonschema +github.com/josharian/intern +github.com/mailru/easyjson/jlexer +github.com/mailru/easyjson/buffer +github.com/mailru/easyjson/jwriter +encoding/base32 +sigs.k8s.io/structured-merge-diff/schema +k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json +sigs.k8s.io/structured-merge-diff/fieldpath +google.golang.org/protobuf/internal/encoding/tag +google.golang.org/protobuf/internal/impl +sigs.k8s.io/structured-merge-diff/typed +sigs.k8s.io/structured-merge-diff/merge +github.com/onsi/ginkgo/v2/formatter +github.com/go-logr/logr/funcr +encoding/xml +github.com/onsi/ginkgo/v2/types +internal/saferio +encoding/gob +github.com/onsi/ginkgo/v2/reporters +google.golang.org/protobuf/internal/filetype +html +google.golang.org/protobuf/runtime/protoimpl +google.golang.org/protobuf/types/known/anypb +text/template/parse +os/signal +github.com/google/gnostic-models/extensions +k8s.io/apimachinery/pkg/util/rand +golang.org/x/sys/unix +k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/pkg/util/runtime golang.org/x/net/http2 k8s.io/apimachinery/pkg/runtime @@ -1012,121 +1089,80 @@ github.com/moby/spdystream/spdy github.com/moby/spdystream net/http/httputil +golang.org/x/net/websocket k8s.io/apimachinery/pkg/runtime/serializer/recognizer k8s.io/apimachinery/pkg/runtime/serializer/json k8s.io/apimachinery/pkg/api/apitesting/naming k8s.io/apimachinery/pkg/runtime/serializer/streaming k8s.io/apimachinery/pkg/runtime/serializer/yaml k8s.io/apimachinery/pkg/runtime/testing -golang.org/x/net/websocket -google.golang.org/protobuf/runtime/protoiface -google.golang.org/protobuf/proto -k8s.io/apimachinery/pkg/util/net -google.golang.org/protobuf/internal/descfmt -google.golang.org/protobuf/internal/descopts -google.golang.org/protobuf/internal/encoding/text -github.com/google/gnostic-models/jsonschema -k8s.io/apimachinery/pkg/watch -google.golang.org/protobuf/internal/encoding/defval -google.golang.org/protobuf/internal/filedesc -k8s.io/apimachinery/pkg/apis/meta/v1 -google.golang.org/protobuf/encoding/prototext -github.com/PuerkitoBio/urlesc -golang.org/x/text/width -github.com/PuerkitoBio/purell -google.golang.org/protobuf/internal/encoding/tag -github.com/josharian/intern -github.com/mailru/easyjson/jlexer -google.golang.org/protobuf/internal/impl -github.com/mailru/easyjson/buffer -github.com/mailru/easyjson/jwriter +github.com/google/gnostic-models/compiler github.com/go-openapi/swag +github.com/google/gnostic-models/openapiv2 +k8s.io/apimachinery/pkg/util/net +github.com/google/gnostic-models/openapiv3 github.com/go-openapi/jsonpointer +k8s.io/apimachinery/pkg/watch github.com/go-openapi/jsonreference -encoding/base32 -k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json +k8s.io/kube-openapi/pkg/internal +k8s.io/apimachinery/pkg/apis/meta/v1 +text/template +html/template +net/rpc +github.com/onsi/ginkgo/v2/internal/parallel_support +github.com/onsi/ginkgo/v2/internal/interrupt_handler +github.com/onsi/ginkgo/v2/internal +k8s.io/kube-openapi/pkg/validation/spec +k8s.io/kube-openapi/pkg/util/proto k8s.io/apimachinery/pkg/runtime/serializer/protobuf k8s.io/apimachinery/pkg/apis/meta/v1/unstructured -k8s.io/apimachinery/pkg/runtime/serializer/versioning -k8s.io/apimachinery/pkg/runtime/serializer -k8s.io/apimachinery/pkg/api/apitesting -k8s.io/apimachinery/pkg/api/apitesting/fuzzer k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/meta k8s.io/apimachinery/pkg/apis/meta/v1beta1 -k8s.io/apimachinery/pkg/apis/meta/fuzzer +k8s.io/apimachinery/pkg/runtime/serializer/versioning k8s.io/apimachinery/pkg/api/errors +k8s.io/apimachinery/pkg/runtime/serializer k8s.io/apimachinery/pkg/apis/meta/v1/validation -k8s.io/apimachinery/pkg/apis/meta/internalversion -k8s.io/apimachinery/pkg/api/apitesting/roundtrip +k8s.io/apimachinery/pkg/api/apitesting +k8s.io/apimachinery/pkg/api/apitesting/fuzzer k8s.io/apimachinery/pkg/api/meta/table +k8s.io/apimachinery/pkg/apis/meta/internalversion +k8s.io/apimachinery/pkg/apis/meta/fuzzer k8s.io/apimachinery/pkg/api/meta/testrestmapper k8s.io/apimachinery/pkg/api/validation k8s.io/apimachinery/pkg/apis/meta/internalversion/scheme -k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructuredscheme +k8s.io/apimachinery/pkg/api/apitesting/roundtrip k8s.io/apimachinery/pkg/apis/meta/internalversion/validation +k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructuredscheme k8s.io/apimachinery/pkg/apis/meta/v1beta1/validation k8s.io/apimachinery/pkg/apis/testapigroup k8s.io/apimachinery/pkg/util/proxy k8s.io/apimachinery/pkg/util/remotecommand k8s.io/apimachinery/pkg/util/httpstream/wsstream k8s.io/apimachinery/pkg/apis/testapigroup/v1 -google.golang.org/protobuf/internal/filetype +k8s.io/kube-openapi/pkg/schemaconv +github.com/onsi/ginkgo/v2/internal/global +github.com/onsi/ginkgo/v2/internal/testingtproxy k8s.io/apimachinery/pkg/util/httpstream/spdy -google.golang.org/protobuf/runtime/protoimpl -google.golang.org/protobuf/types/known/anypb -github.com/google/gnostic-models/extensions -k8s.io/kube-openapi/pkg/internal -github.com/google/gnostic-models/compiler -sigs.k8s.io/structured-merge-diff/schema +github.com/onsi/ginkgo/v2 +k8s.io/apimachinery/pkg/util/managedfields/internal k8s.io/apimachinery/pkg/apis/testapigroup/fuzzer k8s.io/apimachinery/pkg/apis/testapigroup/install k8s.io/apimachinery/pkg/test -sigs.k8s.io/structured-merge-diff/fieldpath -github.com/google/gnostic-models/openapiv2 -github.com/google/gnostic-models/openapiv3 -sigs.k8s.io/structured-merge-diff/typed -sigs.k8s.io/structured-merge-diff/merge -github.com/onsi/ginkgo/v2/formatter -github.com/go-logr/logr/funcr -encoding/xml -github.com/onsi/ginkgo/v2/types -github.com/onsi/ginkgo/v2/reporters -internal/saferio -encoding/gob -k8s.io/kube-openapi/pkg/util/proto -k8s.io/kube-openapi/pkg/validation/spec -html -text/template/parse -os/signal -golang.org/x/sys/unix -k8s.io/kube-openapi/pkg/schemaconv -text/template -k8s.io/apimachinery/pkg/util/managedfields/internal -html/template -k8s.io/apimachinery/pkg/util/managedfields -k8s.io/apimachinery/pkg/util/managedfields/internal/testing -net/rpc -k8s.io/apimachinery/pkg/util/managedfields/managedfieldstest -k8s.io/apimachinery/pkg/util/rand -k8s.io/apimachinery/third_party/forked/golang/json -github.com/onsi/ginkgo/v2/internal/parallel_support k8s.io/apimachinery/pkg/util/strategicpatch -github.com/onsi/ginkgo/v2/internal/interrupt_handler +k8s.io/apimachinery/pkg/util/net/testing k8s.io/kube-openapi/pkg/spec3 -github.com/onsi/ginkgo/v2/internal database/sql/driver +k8s.io/apimachinery/pkg/util/managedfields github.com/google/uuid -k8s.io/apimachinery/pkg/util/uuid k8s.io/apimachinery/pkg/util/version -k8s.io/apimachinery/pkg/util/strategicpatch/testing k8s.io/apimachinery/pkg/util/wait +k8s.io/apimachinery/pkg/util/uuid k8s.io/apimachinery/pkg/util/waitgroup +k8s.io/apimachinery/pkg/util/managedfields/internal/testing k8s.io/apimachinery/pkg/version -github.com/onsi/ginkgo/v2/internal/global -github.com/onsi/ginkgo/v2/internal/testingtproxy -github.com/onsi/ginkgo/v2 -k8s.io/apimachinery/pkg/util/net/testing +k8s.io/apimachinery/pkg/util/managedfields/managedfieldstest +k8s.io/apimachinery/pkg/util/strategicpatch/testing debian/rules execute_before_dh_auto_test make[1]: Entering directory '/build/reproducible-path/golang-k8s-apimachinery-0.29.0' # these tests fail because they need to load a big swagger.json file @@ -1134,14 +1170,14 @@ find _build/src/k8s.io/apimachinery/pkg/util/managedfields -name "*_test.go" -delete make[1]: Leaving directory '/build/reproducible-path/golang-k8s-apimachinery-0.29.0' dh_auto_test -O--builddirectory=_build -O--buildsystem=golang - cd _build && go test -vet=off -v -p 3 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/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/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 4 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/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/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] +? k8s.io/apimachinery/pkg/api/apitesting/naming [no test files] === RUN TestValueFuzz --- PASS: TestValueFuzz (0.00s) PASS -ok k8s.io/apimachinery/pkg/api/apitesting/fuzzer 0.063s -? k8s.io/apimachinery/pkg/api/apitesting/naming [no test files] +ok k8s.io/apimachinery/pkg/api/apitesting/fuzzer 0.060s ? k8s.io/apimachinery/pkg/api/apitesting/roundtrip [no test files] ? k8s.io/apimachinery/pkg/api/equality [no test files] === RUN TestErrorNew @@ -1237,7 +1273,8 @@ === RUN TestStatusCauseSupportsWrappedErrors --- PASS: TestStatusCauseSupportsWrappedErrors (0.00s) PASS -ok k8s.io/apimachinery/pkg/api/errors 0.061s +ok k8s.io/apimachinery/pkg/api/errors 0.038s +? k8s.io/apimachinery/pkg/api/meta/table [no test files] === RUN TestSetStatusCondition === RUN TestSetStatusCondition/should-add === RUN TestSetStatusCondition/use-supplied-time @@ -1293,19 +1330,19 @@ === RUN TestEachList/UnstructuredList === RUN TestEachList/UnstructuredList/EachListItem === RUN TestEachList/UnstructuredList/EachListItemWithAlloc ---- PASS: TestEachList (0.07s) - --- PASS: TestEachList/StructReceiverList (0.01s) +--- PASS: TestEachList (0.09s) + --- PASS: TestEachList/StructReceiverList (0.02s) --- PASS: TestEachList/StructReceiverList/EachListItem (0.01s) - --- PASS: TestEachList/StructReceiverList/EachListItemWithAlloc (0.00s) - --- PASS: TestEachList/PointerReceiverList (0.01s) - --- PASS: TestEachList/PointerReceiverList/EachListItem (0.00s) - --- PASS: TestEachList/PointerReceiverList/EachListItemWithAlloc (0.00s) + --- PASS: TestEachList/StructReceiverList/EachListItemWithAlloc (0.01s) + --- PASS: TestEachList/PointerReceiverList (0.02s) + --- PASS: TestEachList/PointerReceiverList/EachListItem (0.02s) + --- PASS: TestEachList/PointerReceiverList/EachListItemWithAlloc (0.01s) --- PASS: TestEachList/RawExtensionList (0.03s) - --- PASS: TestEachList/RawExtensionList/EachListItem (0.02s) + --- PASS: TestEachList/RawExtensionList/EachListItem (0.03s) --- PASS: TestEachList/RawExtensionList/EachListItemWithAlloc (0.00s) - --- PASS: TestEachList/UnstructuredList (0.02s) - --- PASS: TestEachList/UnstructuredList/EachListItem (0.01s) - --- PASS: TestEachList/UnstructuredList/EachListItemWithAlloc (0.01s) + --- PASS: TestEachList/UnstructuredList (0.01s) + --- PASS: TestEachList/UnstructuredList/EachListItem (0.00s) + --- PASS: TestEachList/UnstructuredList/EachListItemWithAlloc (0.00s) === RUN TestExtractList === RUN TestExtractList/StructReceiverList === RUN TestExtractList/StructReceiverList/ExtractList @@ -1319,21 +1356,21 @@ === RUN TestExtractList/UnstructuredList === RUN TestExtractList/UnstructuredList/ExtractList === RUN TestExtractList/UnstructuredList/ExtractListWithAlloc ---- PASS: TestExtractList (0.09s) - --- PASS: TestExtractList/StructReceiverList (0.02s) - --- PASS: TestExtractList/StructReceiverList/ExtractList (0.01s) +--- PASS: TestExtractList (0.12s) + --- PASS: TestExtractList/StructReceiverList (0.05s) + --- PASS: TestExtractList/StructReceiverList/ExtractList (0.04s) --- PASS: TestExtractList/StructReceiverList/ExtractListWithAlloc (0.01s) - --- PASS: TestExtractList/PointerReceiverList (0.02s) + --- PASS: TestExtractList/PointerReceiverList (0.03s) --- PASS: TestExtractList/PointerReceiverList/ExtractList (0.02s) --- PASS: TestExtractList/PointerReceiverList/ExtractListWithAlloc (0.01s) - --- PASS: TestExtractList/RawExtensionList (0.02s) + --- PASS: TestExtractList/RawExtensionList (0.01s) --- PASS: TestExtractList/RawExtensionList/ExtractList (0.01s) --- PASS: TestExtractList/RawExtensionList/ExtractListWithAlloc (0.01s) - --- PASS: TestExtractList/UnstructuredList (0.02s) + --- PASS: TestExtractList/UnstructuredList (0.01s) --- PASS: TestExtractList/UnstructuredList/ExtractList (0.01s) - --- PASS: TestExtractList/UnstructuredList/ExtractListWithAlloc (0.01s) + --- PASS: TestExtractList/UnstructuredList/ExtractListWithAlloc (0.00s) === RUN TestAsPartialObjectMetadata ---- PASS: TestAsPartialObjectMetadata (0.08s) +--- PASS: TestAsPartialObjectMetadata (0.04s) === RUN TestMultiRESTMapperResourceFor --- PASS: TestMultiRESTMapperResourceFor (0.00s) === RUN TestMultiRESTMapperResourcesFor @@ -1373,8 +1410,7 @@ === RUN TestRESTMapperReportsErrorOnBadVersion --- PASS: TestRESTMapperReportsErrorOnBadVersion (0.00s) PASS -ok k8s.io/apimachinery/pkg/api/meta 0.268s -? k8s.io/apimachinery/pkg/api/meta/table [no test files] +ok k8s.io/apimachinery/pkg/api/meta 0.323s ? k8s.io/apimachinery/pkg/api/meta/testrestmapper [no test files] === RUN TestInt64AmountAsInt64 --- PASS: TestInt64AmountAsInt64 (0.00s) @@ -1437,7 +1473,7 @@ === RUN TestParseQuantityString --- PASS: TestParseQuantityString (0.00s) === RUN TestQuantityParse ---- PASS: TestQuantityParse (0.00s) +--- PASS: TestQuantityParse (0.01s) === RUN TestQuantityRoundUp --- PASS: TestQuantityRoundUp (0.00s) === RUN TestQuantityCmpInt64AndDec @@ -1516,7 +1552,7 @@ === RUN TestQuantityAsApproximateFloat64/DecimalSI_12E === RUN TestQuantityAsApproximateFloat64/DecimalSI_1200 === RUN TestQuantityAsApproximateFloat64/DecimalSI_-1200 ---- PASS: TestQuantityAsApproximateFloat64 (0.00s) +--- PASS: TestQuantityAsApproximateFloat64 (0.01s) --- PASS: TestQuantityAsApproximateFloat64/DecimalSI_0 (0.00s) --- PASS: TestQuantityAsApproximateFloat64/DecimalExponent_0 (0.00s) --- PASS: TestQuantityAsApproximateFloat64/BinarySI_0 (0.00s) @@ -1573,7 +1609,7 @@ === RUN ExampleMustParse --- PASS: ExampleMustParse (0.00s) PASS -ok k8s.io/apimachinery/pkg/api/resource 0.066s +ok k8s.io/apimachinery/pkg/api/resource 0.095s === RUN TestMaskTrailingDash --- PASS: TestMaskTrailingDash (0.00s) === RUN TestValidateObjectMetaCustomName @@ -1597,14 +1633,14 @@ === RUN TestValidateAnnotations --- PASS: TestValidateAnnotations (0.00s) PASS -ok k8s.io/apimachinery/pkg/api/validation 0.049s +ok k8s.io/apimachinery/pkg/api/validation 0.061s +? k8s.io/apimachinery/pkg/apis/meta/fuzzer [no test files] === RUN TestValidatePathSegmentName --- PASS: TestValidatePathSegmentName (0.00s) === RUN TestValidateWithMultiErrors --- PASS: TestValidateWithMultiErrors (0.00s) PASS -ok k8s.io/apimachinery/pkg/api/validation/path 0.010s -? k8s.io/apimachinery/pkg/apis/meta/fuzzer [no test files] +ok k8s.io/apimachinery/pkg/api/validation/path 0.040s === RUN TestSetListOptionsDefaults === RUN TestSetListOptionsDefaults/no-op,_RV_doesn't_match === RUN TestSetListOptionsDefaults/no-op,_SendInitialEvents_set @@ -1628,13 +1664,93 @@ --- 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.034s +ok k8s.io/apimachinery/pkg/apis/meta/internalversion 0.097s === 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=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/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/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/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=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/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 + 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/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=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 @@ -1655,31 +1771,68 @@ 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 - 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=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/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/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=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=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/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/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/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 @@ -1687,94 +1840,17 @@ 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/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=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 - 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 - 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=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/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/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/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/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=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=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 @@ -1795,50 +1871,10 @@ 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=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/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/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:148: finished group "meta.k8s.io" ---- PASS: TestRoundTrip (0.07s) +--- PASS: TestRoundTrip (0.16s) PASS -ok k8s.io/apimachinery/pkg/apis/meta/internalversion/scheme 0.096s +ok k8s.io/apimachinery/pkg/apis/meta/internalversion/scheme 0.256s === RUN TestValidateListOptions === RUN TestValidateListOptions/valid-default === RUN TestValidateListOptions/valid-resourceversionmatch-exact @@ -1878,7 +1914,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.035s +ok k8s.io/apimachinery/pkg/apis/meta/internalversion/validation 0.050s === RUN TestNewControllerRef --- PASS: TestNewControllerRef (0.00s) === RUN TestGetControllerOf @@ -1888,7 +1924,7 @@ === RUN TestDurationMarshalYAML --- PASS: TestDurationMarshalYAML (0.00s) === RUN TestDurationUnmarshalYAML ---- PASS: TestDurationUnmarshalYAML (0.00s) +--- PASS: TestDurationUnmarshalYAML (0.01s) === RUN TestDurationMarshalJSON --- PASS: TestDurationMarshalJSON (0.00s) === RUN TestDurationUnmarshalJSON @@ -2980,7 +3016,7 @@ === RUN TestPatchOptionsIsSuperSetOfUpdateOptions/Run_997/1000 === RUN TestPatchOptionsIsSuperSetOfUpdateOptions/Run_998/1000 === RUN TestPatchOptionsIsSuperSetOfUpdateOptions/Run_999/1000 ---- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions (0.44s) +--- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions (0.45s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_0/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_1/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_2/1000 (0.00s) @@ -2989,7 +3025,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_5/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_6/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_7/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_8/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_8/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_9/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_10/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_11/1000 (0.00s) @@ -3559,7 +3595,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_575/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_576/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_577/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_578/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_578/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_579/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_580/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_581/1000 (0.00s) @@ -3584,7 +3620,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_600/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_601/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_602/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_603/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_603/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_604/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_605/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_606/1000 (0.00s) @@ -3603,7 +3639,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_619/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_620/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_621/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_622/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_622/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_623/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_624/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_625/1000 (0.00s) @@ -3673,7 +3709,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_689/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_690/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_691/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_692/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_692/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_693/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_694/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_695/1000 (0.00s) @@ -3699,7 +3735,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_715/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_716/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_717/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_718/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_718/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_719/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_720/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_721/1000 (0.00s) @@ -3742,7 +3778,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_758/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_759/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_760/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_761/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_761/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_762/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_763/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_764/1000 (0.00s) @@ -3820,7 +3856,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_836/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_837/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_838/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_839/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_839/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_840/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_841/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_842/1000 (0.00s) @@ -3976,7 +4012,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_992/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_993/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_994/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_995/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_995/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_996/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_997/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_998/1000 (0.00s) @@ -4032,11 +4068,12 @@ === RUN TestMapToLabelSelectorRoundTrip --- PASS: TestMapToLabelSelectorRoundTrip (0.00s) === RUN TestConvertSliceStringToDeletionPropagation ---- PASS: TestConvertSliceStringToDeletionPropagation (0.01s) +--- PASS: TestConvertSliceStringToDeletionPropagation (0.00s) === RUN TestConvertSliceStringToPointerTime --- PASS: TestConvertSliceStringToPointerTime (0.00s) PASS -ok k8s.io/apimachinery/pkg/apis/meta/v1 0.790s +ok k8s.io/apimachinery/pkg/apis/meta/v1 0.557s +? k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructuredscheme [no test files] === RUN TestCodecOfUnstructuredList --- PASS: TestCodecOfUnstructuredList (0.00s) === RUN TestRemoveNestedField @@ -4087,7 +4124,7 @@ === RUN TestUnstructuredToObjectConversion/convert_valid_versioned_unstructured_to_hub-versioned_object_should_work === RUN TestUnstructuredToObjectConversion/convert_unexisting-versioned_unstructured_to_hub-versioned_object_should_fail === RUN TestUnstructuredToObjectConversion/convert_valid_versioned_unstructured_to_object_w/_a_mismatching_kind_should_fail ---- PASS: TestUnstructuredToObjectConversion (0.00s) +--- PASS: TestUnstructuredToObjectConversion (0.01s) --- PASS: TestUnstructuredToObjectConversion/convert_empty_unstructured_w/o_gvk_to_versioned_object_should_fail (0.00s) --- PASS: TestUnstructuredToObjectConversion/convert_empty_versioned_unstructured_to_versioned_object_should_work (0.00s) --- PASS: TestUnstructuredToObjectConversion/convert_empty_unstructured_w/o_gvk_to_versioned_object_should_fail#01 (0.00s) @@ -4118,12 +4155,12 @@ === RUN TestNilUnstructuredContent --- PASS: TestNilUnstructuredContent (0.00s) === RUN TestUnstructuredMetadataRoundTrip ---- PASS: TestUnstructuredMetadataRoundTrip (0.52s) +--- PASS: TestUnstructuredMetadataRoundTrip (0.91s) === RUN TestUnstructuredMetadataOmitempty --- PASS: TestUnstructuredMetadataOmitempty (0.00s) PASS -ok k8s.io/apimachinery/pkg/apis/meta/v1/unstructured 0.543s -? k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructuredscheme [no test files] +ok k8s.io/apimachinery/pkg/apis/meta/v1/unstructured 0.973s +? k8s.io/apimachinery/pkg/apis/meta/v1beta1 [no test files] === RUN TestValidateLabels --- PASS: TestValidateLabels (0.00s) === RUN TestValidDryRun @@ -4141,23 +4178,23 @@ --- PASS: TestInvalidDryRun/[False] (0.00s) --- PASS: TestInvalidDryRun/[All_False] (0.00s) === RUN TestValidPatchOptions -=== RUN TestValidPatchOptions/{{_}_[]_0x190e1f4_kubectl_} +=== RUN TestValidPatchOptions/{{_}_[]_0x250e9b4_kubectl_} === RUN TestValidPatchOptions/{{_}_[]__kubectl_} === RUN TestValidPatchOptions/{{_}_[]___} === RUN TestValidPatchOptions/{{_}_[]__patcher_} --- PASS: TestValidPatchOptions (0.00s) - --- PASS: TestValidPatchOptions/{{_}_[]_0x190e1f4_kubectl_} (0.00s) + --- PASS: TestValidPatchOptions/{{_}_[]_0x250e9b4_kubectl_} (0.00s) --- PASS: TestValidPatchOptions/{{_}_[]__kubectl_} (0.00s) --- PASS: TestValidPatchOptions/{{_}_[]___} (0.00s) --- PASS: TestValidPatchOptions/{{_}_[]__patcher_} (0.00s) === RUN TestInvalidPatchOptions === RUN TestInvalidPatchOptions/{{_}_[]___} -=== RUN TestInvalidPatchOptions/{{_}_[]_0x190e2f4__} -=== RUN TestInvalidPatchOptions/{{_}_[]_0x190e2f5_kubectl_} +=== RUN TestInvalidPatchOptions/{{_}_[]_0x250eab4__} +=== RUN TestInvalidPatchOptions/{{_}_[]_0x250eab5_kubectl_} --- PASS: TestInvalidPatchOptions (0.00s) --- PASS: TestInvalidPatchOptions/{{_}_[]___} (0.00s) - --- PASS: TestInvalidPatchOptions/{{_}_[]_0x190e2f4__} (0.00s) - --- PASS: TestInvalidPatchOptions/{{_}_[]_0x190e2f5_kubectl_} (0.00s) + --- PASS: TestInvalidPatchOptions/{{_}_[]_0x250eab4__} (0.00s) + --- PASS: TestInvalidPatchOptions/{{_}_[]_0x250eab5_kubectl_} (0.00s) === RUN TestValidateFieldManagerValid === RUN TestValidateFieldManagerValid/filedManager === RUN TestValidateFieldManagerValid/你好 @@ -4217,11 +4254,11 @@ --- 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.052s -? k8s.io/apimachinery/pkg/apis/meta/v1beta1 [no test files] +ok k8s.io/apimachinery/pkg/apis/meta/v1/validation 0.068s ? k8s.io/apimachinery/pkg/apis/meta/v1beta1/validation [no test files] ? k8s.io/apimachinery/pkg/apis/testapigroup [no test files] ? k8s.io/apimachinery/pkg/apis/testapigroup/fuzzer [no test files] +? k8s.io/apimachinery/pkg/apis/testapigroup/v1 [no test files] === RUN TestRoundTrip roundtrip.go:135: starting group "" roundtrip.go:148: finished group "" @@ -4271,10 +4308,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.07s) +--- PASS: TestRoundTrip (0.16s) PASS -ok k8s.io/apimachinery/pkg/apis/testapigroup/install 0.081s -? k8s.io/apimachinery/pkg/apis/testapigroup/v1 [no test files] +ok k8s.io/apimachinery/pkg/apis/testapigroup/install 0.235s === RUN TestConverter_byteSlice --- PASS: TestConverter_byteSlice (0.00s) === RUN TestConverter_MismatchedTypes @@ -4294,11 +4330,11 @@ === RUN TestEnforceNilPtr --- PASS: TestEnforceNilPtr (0.00s) PASS -ok k8s.io/apimachinery/pkg/conversion 0.031s +ok k8s.io/apimachinery/pkg/conversion 0.015s === RUN TestConvert --- PASS: TestConvert (0.00s) PASS -ok k8s.io/apimachinery/pkg/conversion/queryparams 0.058s +ok k8s.io/apimachinery/pkg/conversion/queryparams 0.039s === RUN TestSetString --- PASS: TestSetString (0.00s) === RUN TestFieldHas @@ -4332,7 +4368,7 @@ === RUN TestTransform --- PASS: TestTransform (0.00s) PASS -ok k8s.io/apimachinery/pkg/fields 0.041s +ok k8s.io/apimachinery/pkg/fields 0.036s === RUN TestSetString --- PASS: TestSetString (0.00s) === RUN TestLabelHas @@ -4370,7 +4406,7 @@ === RUN TestRequirementConstructor --- PASS: TestRequirementConstructor (0.00s) === RUN TestToString ---- PASS: TestToString (0.01s) +--- PASS: TestToString (0.00s) === RUN TestRequirementSelectorMatching --- PASS: TestRequirementSelectorMatching (0.00s) === RUN TestSetSelectorParser @@ -4403,7 +4439,7 @@ === RUN TestRequiresExactMatch/keyDoubleEqualOperatorExactMatch === RUN TestRequiresExactMatch/keyNotEqualOperatorExactMatch === RUN TestRequiresExactMatch/keyEqualOperatorExactMatchFirst ---- PASS: TestRequiresExactMatch (0.00s) +--- PASS: TestRequiresExactMatch (0.01s) --- PASS: TestRequiresExactMatch/keyInOperatorExactMatch (0.00s) --- PASS: TestRequiresExactMatch/keyInOperatorNotExactMatch (0.00s) --- PASS: TestRequiresExactMatch/keyInOperatorNotExactMatch#01 (0.00s) @@ -4424,7 +4460,7 @@ --- 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.047s +ok k8s.io/apimachinery/pkg/labels 0.065s === RUN TestAllocatorRandomInputs --- PASS: TestAllocatorRandomInputs (0.01s) === RUN TestAllocatorNeverShrinks @@ -4603,24 +4639,24 @@ === RUN TestCustomToUnstructured/0.0 === PAUSE TestCustomToUnstructured/0.0 === CONT TestCustomToUnstructured/null +=== CONT TestCustomToUnstructured/{} === CONT TestCustomToUnstructured/0.0 === CONT TestCustomToUnstructured/0 === CONT TestCustomToUnstructured/{"a":1} -=== CONT TestCustomToUnstructured/{} === CONT TestCustomToUnstructured/[1] -=== CONT TestCustomToUnstructured/[] === CONT TestCustomToUnstructured/false === CONT TestCustomToUnstructured/true +=== CONT TestCustomToUnstructured/[] --- PASS: TestCustomToUnstructured (0.00s) --- PASS: TestCustomToUnstructured/null (0.00s) - --- PASS: TestCustomToUnstructured/0.0 (0.00s) - --- PASS: TestCustomToUnstructured/0 (0.00s) - --- PASS: TestCustomToUnstructured/{"a":1} (0.00s) --- PASS: TestCustomToUnstructured/{} (0.00s) + --- PASS: TestCustomToUnstructured/{"a":1} (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 (0.00s) + --- PASS: TestCustomToUnstructured/0 (0.00s) + --- PASS: TestCustomToUnstructured/[] (0.00s) === RUN TestCustomToUnstructuredTopLevel === RUN TestCustomToUnstructuredTopLevel/0 === PAUSE TestCustomToUnstructuredTopLevel/0 @@ -4797,9 +4833,9 @@ === RUN TestBestMatch --- PASS: TestBestMatch (0.00s) PASS -ok k8s.io/apimachinery/pkg/runtime/schema 0.006s +ok k8s.io/apimachinery/pkg/runtime/schema 0.036s === RUN TestTypes ---- PASS: TestTypes (1.08s) +--- PASS: TestTypes (1.44s) === RUN TestVersionedEncoding --- PASS: TestVersionedEncoding (0.00s) === RUN TestMultipleNames @@ -4809,7 +4845,7 @@ === RUN TestConvertTypesWhenDefaultNamesMatch --- PASS: TestConvertTypesWhenDefaultNamesMatch (0.00s) === RUN TestEncode_Ptr ---- PASS: TestEncode_Ptr (0.01s) +--- PASS: TestEncode_Ptr (0.00s) === RUN TestBadJSONRejection --- PASS: TestBadJSONRejection (0.00s) === RUN TestDirectCodec @@ -4819,39 +4855,39 @@ sparse_test.go:70: {"kind":"FakeV2DifferentObj","apiVersion":"mygroup/v2","name":"foo","creationTimestamp":null} ---- PASS: TestSparse (0.02s) +--- PASS: TestSparse (0.00s) PASS -ok k8s.io/apimachinery/pkg/runtime/serializer 1.150s +ok k8s.io/apimachinery/pkg/runtime/serializer 1.514s === RUN TestJSONLimits === RUN TestJSONLimits/3MB_of_deeply_nested_slices === 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/utiljson === RUN TestJSONLimits/3MB_of_unbalanced_nested_slices/gojson +=== RUN TestJSONLimits/3MB_of_unbalanced_nested_slices/utiljson === 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.34s) +--- PASS: TestJSONLimits (0.84s) --- PASS: TestJSONLimits/3MB_of_deeply_nested_slices (0.00s) --- PASS: TestJSONLimits/3MB_of_deeply_nested_slices/gojson (0.00s) --- 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 (0.01s) + --- PASS: TestJSONLimits/3MB_of_unbalanced_nested_slices/gojson (0.01s) --- PASS: TestJSONLimits/3MB_of_unbalanced_nested_slices/utiljson (0.00s) - --- PASS: TestJSONLimits/3MB_of_unbalanced_nested_slices/gojson (0.00s) - --- PASS: TestJSONLimits/3MB_of_deeply_nested_maps (0.00s) + --- PASS: TestJSONLimits/3MB_of_deeply_nested_maps (0.06s) --- 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) - --- PASS: TestJSONLimits/3MB_of_unbalanced_nested_maps/gojson (0.00s) - --- PASS: TestJSONLimits/3MB_of_unbalanced_nested_maps/utiljson (0.00s) + --- PASS: TestJSONLimits/3MB_of_deeply_nested_maps/utiljson (0.06s) + --- PASS: TestJSONLimits/3MB_of_unbalanced_nested_maps (0.02s) + --- PASS: TestJSONLimits/3MB_of_unbalanced_nested_maps/gojson (0.02s) + --- PASS: TestJSONLimits/3MB_of_unbalanced_nested_maps/utiljson (0.01s) === RUN TestSimpleMetaFactoryInterpret --- PASS: TestSimpleMetaFactoryInterpret (0.00s) === RUN TestDecode ---- PASS: TestDecode (0.00s) +--- PASS: TestDecode (0.01s) === RUN TestCacheableObject === RUN TestCacheableObject/delegate === RUN TestCacheableObject/delegate_return_self @@ -4863,7 +4899,8 @@ --- PASS: TestCacheableObject/cached_success (0.00s) --- PASS: TestCacheableObject/cached_failure (0.00s) PASS -ok k8s.io/apimachinery/pkg/runtime/serializer/json 0.387s +ok k8s.io/apimachinery/pkg/runtime/serializer/json 0.972s +? k8s.io/apimachinery/pkg/runtime/serializer/recognizer [no test files] === RUN TestCacheableObject === RUN TestCacheableObject/delegate === RUN TestCacheableObject/delegate_return_self @@ -4893,20 +4930,19 @@ --- PASS: TestRawSerializerEncodeWithAllocator (0.00s) --- PASS: TestRawSerializerEncodeWithAllocator/encode_a_bufferedReverseMarshaller_obj (0.00s) PASS -ok k8s.io/apimachinery/pkg/runtime/serializer/protobuf 0.024s -? k8s.io/apimachinery/pkg/runtime/serializer/recognizer [no test files] +ok k8s.io/apimachinery/pkg/runtime/serializer/protobuf 0.079s === 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.010s +ok k8s.io/apimachinery/pkg/runtime/serializer/recognizer/testing 0.032s === RUN TestEmptyDecoder --- PASS: TestEmptyDecoder (0.00s) === RUN TestDecoder ---- PASS: TestDecoder (0.19s) +--- PASS: TestDecoder (0.11s) PASS -ok k8s.io/apimachinery/pkg/runtime/serializer/streaming 0.221s +ok k8s.io/apimachinery/pkg/runtime/serializer/streaming 0.135s === RUN TestNestedDecode --- PASS: TestNestedDecode (0.00s) === RUN TestNestedDecodeStrictDecodingError @@ -4939,7 +4975,9 @@ === RUN TestDecodeUnstructured --- PASS: TestDecodeUnstructured (0.00s) PASS -ok k8s.io/apimachinery/pkg/runtime/serializer/versioning 0.014s +ok k8s.io/apimachinery/pkg/runtime/serializer/versioning 0.104s +? k8s.io/apimachinery/pkg/runtime/testing [no test files] +? k8s.io/apimachinery/pkg/selection [no test files] === RUN TestInterpret === RUN TestInterpret/YAMLSuccessfullyInterpretVK === RUN TestInterpret/YAMLSuccessfullyInterpretGVK @@ -4961,7 +4999,7 @@ === RUN TestInterpret/JSONSuccessfullyWrongFormat === RUN TestInterpret/JSONFailInterpretArray === RUN TestInterpret/JSONFailInterpretWrongSyntax ---- PASS: TestInterpret (0.00s) +--- PASS: TestInterpret (0.01s) --- PASS: TestInterpret/YAMLSuccessfullyInterpretVK (0.00s) --- PASS: TestInterpret/YAMLSuccessfullyInterpretGVK (0.00s) --- PASS: TestInterpret/YAMLSuccessfullyInterpretV (0.00s) @@ -4984,8 +5022,8 @@ --- PASS: TestInterpret/JSONFailInterpretWrongSyntax (0.00s) === RUN TestYAMLLimits === RUN TestYAMLLimits/arrays_of_string_aliases -=== RUN TestYAMLLimits/arrays_of_string_aliases/sigsyaml === RUN TestYAMLLimits/arrays_of_string_aliases/utilyaml +=== RUN TestYAMLLimits/arrays_of_string_aliases/sigsyaml === RUN TestYAMLLimits/deeply_nested_slices === RUN TestYAMLLimits/deeply_nested_slices/sigsyaml === RUN TestYAMLLimits/deeply_nested_slices/utilyaml @@ -4995,24 +5033,23 @@ === RUN TestYAMLLimits/deeply_nested_indents === RUN TestYAMLLimits/deeply_nested_indents/sigsyaml === RUN TestYAMLLimits/deeply_nested_indents/utilyaml ---- PASS: TestYAMLLimits (0.70s) - --- PASS: TestYAMLLimits/arrays_of_string_aliases (0.03s) - --- PASS: TestYAMLLimits/arrays_of_string_aliases/sigsyaml (0.02s) - --- PASS: TestYAMLLimits/arrays_of_string_aliases/utilyaml (0.01s) - --- PASS: TestYAMLLimits/deeply_nested_slices (0.10s) +--- PASS: TestYAMLLimits (0.90s) + --- PASS: TestYAMLLimits/arrays_of_string_aliases (0.09s) + --- PASS: TestYAMLLimits/arrays_of_string_aliases/utilyaml (0.05s) + --- PASS: TestYAMLLimits/arrays_of_string_aliases/sigsyaml (0.05s) + --- PASS: TestYAMLLimits/deeply_nested_slices (0.09s) --- PASS: TestYAMLLimits/deeply_nested_slices/sigsyaml (0.05s) - --- PASS: TestYAMLLimits/deeply_nested_slices/utilyaml (0.05s) + --- PASS: TestYAMLLimits/deeply_nested_slices/utilyaml (0.04s) --- PASS: TestYAMLLimits/deeply_nested_maps (0.10s) --- PASS: TestYAMLLimits/deeply_nested_maps/sigsyaml (0.05s) --- PASS: TestYAMLLimits/deeply_nested_maps/utilyaml (0.05s) - --- PASS: TestYAMLLimits/deeply_nested_indents (0.06s) + --- PASS: TestYAMLLimits/deeply_nested_indents (0.08s) --- PASS: TestYAMLLimits/deeply_nested_indents/sigsyaml (0.04s) - --- PASS: TestYAMLLimits/deeply_nested_indents/utilyaml (0.02s) + --- PASS: TestYAMLLimits/deeply_nested_indents/utilyaml (0.04s) PASS -ok k8s.io/apimachinery/pkg/runtime/serializer/yaml 0.741s -? k8s.io/apimachinery/pkg/runtime/testing [no test files] -? k8s.io/apimachinery/pkg/selection [no test files] +ok k8s.io/apimachinery/pkg/runtime/serializer/yaml 0.976s ? k8s.io/apimachinery/pkg/types [no test files] +? k8s.io/apimachinery/pkg/util/diff [no test files] === RUN TestIsList --- PASS: TestIsList (0.00s) === RUN TestExtractList @@ -5028,7 +5065,7 @@ === RUN TestSetListToMatchingType --- PASS: TestSetListToMatchingType (0.00s) === RUN TestSetExtractListRoundTrip ---- PASS: TestSetExtractListRoundTrip (0.06s) +--- PASS: TestSetExtractListRoundTrip (0.07s) === RUN TestAPIObjectMeta --- PASS: TestAPIObjectMeta (0.00s) === RUN TestGenericTypeMeta @@ -5036,7 +5073,7 @@ === RUN TestResourceVersionerOfAPI --- PASS: TestResourceVersionerOfAPI (0.00s) === RUN TestAccessOwnerReferences ---- PASS: TestAccessOwnerReferences (0.02s) +--- PASS: TestAccessOwnerReferences (0.01s) === RUN TestDecodeUnstructured --- PASS: TestDecodeUnstructured (0.00s) === RUN TestDecode @@ -5081,9 +5118,9 @@ === RUN TestDecodeObjects --- PASS: TestDecodeObjects (0.00s) === RUN TestV1EncodeDecodeStatus ---- PASS: TestV1EncodeDecodeStatus (0.00s) +--- PASS: TestV1EncodeDecodeStatus (0.02s) === RUN TestExperimentalEncodeDecodeStatus ---- PASS: TestExperimentalEncodeDecodeStatus (0.01s) +--- PASS: TestExperimentalEncodeDecodeStatus (0.00s) === CONT TestOwnerReferences === RUN TestOwnerReferences/0 === PAUSE TestOwnerReferences/0 @@ -5099,8 +5136,7 @@ --- PASS: TestOwnerReferences/2 (0.00s) --- PASS: TestOwnerReferences/1 (0.00s) PASS -ok k8s.io/apimachinery/pkg/test 0.149s -? k8s.io/apimachinery/pkg/util/diff [no test files] +ok k8s.io/apimachinery/pkg/test 0.215s === RUN TestExpiringCache --- PASS: TestExpiringCache (0.00s) === RUN TestExpiration @@ -5118,7 +5154,7 @@ --- PASS: TestGarbageCollection/three_entries_weird_order (0.00s) --- PASS: TestGarbageCollection/expire_multiple_entries_in_one_cycle (0.00s) === RUN TestStressExpiringCache ---- PASS: TestStressExpiringCache (5.11s) +--- PASS: TestStressExpiringCache (5.14s) === RUN TestSimpleGet --- PASS: TestSimpleGet (0.00s) === RUN TestSimpleRemove @@ -5136,7 +5172,7 @@ === RUN TestLRUKeys --- PASS: TestLRUKeys (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/cache 5.155s +ok k8s.io/apimachinery/pkg/util/cache 5.193s === RUN TestPretty --- PASS: TestPretty (0.00s) === RUN TestForHash @@ -5144,7 +5180,7 @@ === RUN TestOneLine --- PASS: TestOneLine (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/dump 0.031s +ok k8s.io/apimachinery/pkg/util/dump 0.034s === RUN TestHumanDuration === RUN TestHumanDuration/1s === RUN TestHumanDuration/1m10s @@ -5205,7 +5241,7 @@ === RUN TestHumanDurationBoundaries/70080h0m0s === RUN TestHumanDurationBoundaries/78816h0m0s === RUN TestHumanDurationBoundaries/78840h0m0s ---- PASS: TestHumanDurationBoundaries (0.00s) +--- PASS: TestHumanDurationBoundaries (0.01s) --- PASS: TestHumanDurationBoundaries/-2s (0.00s) --- PASS: TestHumanDurationBoundaries/-1.999999999s (0.00s) --- PASS: TestHumanDurationBoundaries/0s (0.00s) @@ -5284,7 +5320,7 @@ --- PASS: TestShortHumanDurationBoundaries/17519h59m59.999s (0.00s) --- PASS: TestShortHumanDurationBoundaries/17520h0m0s (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/duration 0.058s +ok k8s.io/apimachinery/pkg/util/duration 0.052s === RUN TestEmptyAggregate --- PASS: TestEmptyAggregate (0.00s) === RUN TestAggregateWithNil @@ -5330,7 +5366,7 @@ === RUN TestErrConfigurationInvalidWithErrorsIsShortCircuitsOnFirstMatch --- PASS: TestErrConfigurationInvalidWithErrorsIsShortCircuitsOnFirstMatch (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/errors 0.030s +ok k8s.io/apimachinery/pkg/util/errors 0.044s === RUN TestRead --- PASS: TestRead (0.00s) === RUN TestReadLarge @@ -5342,209 +5378,209 @@ === RUN TestJSONFrameReaderShortBuffer --- PASS: TestJSONFrameReaderShortBuffer (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/framer 0.059s +ok k8s.io/apimachinery/pkg/util/framer 0.051s === 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 -=== RUN TestIsUpgradeFailureError/Non-upgrade_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) - --- PASS: TestIsUpgradeFailureError/Non-upgrade_error_should_return_false (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/httpstream 0.044s +ok k8s.io/apimachinery/pkg/util/httpstream 0.054s === RUN TestConnectionCloseIsImmediateThroughAProxy ---- PASS: TestConnectionCloseIsImmediateThroughAProxy (0.01s) +--- PASS: TestConnectionCloseIsImmediateThroughAProxy (0.05s) === RUN TestConnectionPings ---- PASS: TestConnectionPings (0.03s) +--- PASS: TestConnectionPings (0.04s) === RUN TestConnectionRemoveStreams --- PASS: TestConnectionRemoveStreams (0.00s) === RUN TestRoundTripAndNewConnection -=== RUN TestRoundTripAndNewConnection/proxied_https_with_auth_(invalid_hostname_+_InsecureSkipVerify)_->_http - roundtripper_test.go:318: Server URL: http://127.0.0.1:34841 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:36421 - http.go:87: Proxy Request: CONNECT 127.0.0.1:34841 HTTP/1.1 - Host: 127.0.0.1:34841 - Proxy-Authorization: Basic cHJveHl1c2VyOnByb3h5cGFzc3dk - User-Agent: Go-http-client/1.1 - - http.go:142: Server write close, host=127.0.0.1:34841 - http.go:137: Server read close, host=127.0.0.1:34841 - http.go:145: Done handling CONNECT request, host=127.0.0.1:34841 -=== RUN TestRoundTripAndNewConnection/proxied_https_(valid_hostname_+_RootCAs)_->_https_(valid_hostname_+_RootCAs) - roundtripper_test.go:318: Server URL: https://127.0.0.1:35267 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:36817 - http.go:87: Proxy Request: CONNECT 127.0.0.1:35267 HTTP/1.1 - Host: 127.0.0.1:35267 - User-Agent: Go-http-client/1.1 - - http.go:142: Server write close, host=127.0.0.1:35267 - http.go:137: Server read close, host=127.0.0.1:35267 - http.go:145: Done handling CONNECT request, host=127.0.0.1:35267 -=== RUN TestRoundTripAndNewConnection/https_(invalid_hostname_+_hostname_verification) - roundtripper_test.go:318: Server URL: https://127.0.0.1:44113 -2024/05/18 08:10:23 http: TLS handshake error from 127.0.0.1:50030: read tcp 127.0.0.1:44113->127.0.0.1:50030: use of closed network connection +=== RUN TestRoundTripAndNewConnection/no_headers + roundtripper_test.go:318: Server URL: http://127.0.0.1:37905 +=== RUN TestRoundTripAndNewConnection/no_connection_header + roundtripper_test.go:318: Server URL: http://127.0.0.1:37357 === RUN TestRoundTripAndNewConnection/https_(valid_hostname_+_RootCAs) - roundtripper_test.go:318: Server URL: https://127.0.0.1:40681 + roundtripper_test.go:318: Server URL: https://127.0.0.1:35343 === RUN TestRoundTripAndNewConnection/proxied_http->http - roundtripper_test.go:318: Server URL: http://127.0.0.1:35929 - roundtripper_test.go:352: Proxy URL: http://127.0.0.1:40817 - http.go:87: Proxy Request: CONNECT 127.0.0.1:35929 HTTP/1.1 - Host: 127.0.0.1:35929 - User-Agent: Go-http-client/1.1 - - http.go:142: Server write close, host=127.0.0.1:35929 - http.go:137: Server read close, host=127.0.0.1:35929 - http.go:145: Done handling CONNECT request, host=127.0.0.1:35929 -=== RUN TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_InsecureSkipVerify)_->_http - roundtripper_test.go:318: Server URL: http://127.0.0.1:42241 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:45323 - http.go:87: Proxy Request: CONNECT 127.0.0.1:42241 HTTP/1.1 - Host: 127.0.0.1:42241 + roundtripper_test.go:318: Server URL: http://127.0.0.1:33499 + roundtripper_test.go:352: Proxy URL: http://127.0.0.1:33673 + http.go:87: Proxy Request: CONNECT 127.0.0.1:33499 HTTP/1.1 + Host: 127.0.0.1:33499 User-Agent: Go-http-client/1.1 - http.go:142: Server write close, host=127.0.0.1:42241 - http.go:137: Server read close, host=127.0.0.1:42241 - http.go:145: Done handling CONNECT request, host=127.0.0.1:42241 -=== RUN TestRoundTripAndNewConnection/no_headers - roundtripper_test.go:318: Server URL: http://127.0.0.1:39527 -=== RUN TestRoundTripAndNewConnection/https_(invalid_hostname_+_InsecureSkipVerify) - roundtripper_test.go:318: Server URL: https://127.0.0.1:34853 -=== RUN TestRoundTripAndNewConnection/proxied_https_(valid_hostname_+_RootCAs)_->_http - roundtripper_test.go:318: Server URL: http://127.0.0.1:38935 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:40529 - http.go:87: Proxy Request: CONNECT 127.0.0.1:38935 HTTP/1.1 - Host: 127.0.0.1:38935 + http.go:142: Server write close, host=127.0.0.1:33499 + http.go:137: Server read close, host=127.0.0.1:33499 + http.go:145: Done handling CONNECT request, host=127.0.0.1:33499 +=== RUN TestRoundTripAndNewConnection/proxied_https_with_auth_(invalid_hostname_+_InsecureSkipVerify)_->_https_(invalid_hostname) + roundtripper_test.go:318: Server URL: https://127.0.0.1:33015 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:41561 + http.go:87: Proxy Request: CONNECT 127.0.0.1:33015 HTTP/1.1 + Host: 127.0.0.1:33015 + Proxy-Authorization: Basic cHJveHl1c2VyOnByb3h5cGFzc3dk User-Agent: Go-http-client/1.1 - http.go:142: Server write close, host=127.0.0.1:38935 - http.go:137: Server read close, host=127.0.0.1:38935 - http.go:145: Done handling CONNECT request, host=127.0.0.1:38935 -=== RUN TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_InsecureSkipVerify)_->_https_(invalid_hostname) - roundtripper_test.go:318: Server URL: https://127.0.0.1:39195 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:33671 - http.go:87: Proxy Request: CONNECT 127.0.0.1:39195 HTTP/1.1 - Host: 127.0.0.1:39195 + http.go:137: Server read close, host=127.0.0.1:33015 + http.go:142: Server write close, host=127.0.0.1:33015 + http.go:145: Done handling CONNECT request, host=127.0.0.1:33015 +=== RUN TestRoundTripAndNewConnection/no_switching_protocol_status_code + roundtripper_test.go:318: Server URL: http://127.0.0.1:45403 +=== RUN TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_InsecureSkipVerify)_->_http + roundtripper_test.go:318: Server URL: http://127.0.0.1:39093 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:39269 + http.go:87: Proxy Request: CONNECT 127.0.0.1:39093 HTTP/1.1 + Host: 127.0.0.1:39093 User-Agent: Go-http-client/1.1 - http.go:142: Server write close, host=127.0.0.1:39195 - http.go:137: Server read close, host=127.0.0.1:39195 - http.go:145: Done handling CONNECT request, host=127.0.0.1:39195 -=== RUN TestRoundTripAndNewConnection/proxied_https_with_auth_(invalid_hostname_+_InsecureSkipVerify)_->_https_(invalid_hostname) - roundtripper_test.go:318: Server URL: https://127.0.0.1:42685 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:45295 - http.go:87: Proxy Request: CONNECT 127.0.0.1:42685 HTTP/1.1 - Host: 127.0.0.1:42685 + http.go:142: Server write close, host=127.0.0.1:39093 + http.go:137: Server read close, host=127.0.0.1:39093 + http.go:145: Done handling CONNECT request, host=127.0.0.1:39093 +=== RUN TestRoundTripAndNewConnection/proxied_https_with_auth_(invalid_hostname_+_InsecureSkipVerify)_->_http + roundtripper_test.go:318: Server URL: http://127.0.0.1:43343 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:44497 + http.go:87: Proxy Request: CONNECT 127.0.0.1:43343 HTTP/1.1 + Host: 127.0.0.1:43343 Proxy-Authorization: Basic cHJveHl1c2VyOnByb3h5cGFzc3dk User-Agent: Go-http-client/1.1 - http.go:137: Server read close, host=127.0.0.1:42685 - http.go:142: Server write close, host=127.0.0.1:42685 - http.go:145: Done handling CONNECT request, host=127.0.0.1:42685 -=== RUN TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_hostname_verification)_->_https_(invalid_hostname) - roundtripper_test.go:318: Server URL: https://127.0.0.1:38373 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:38459 -2024/05/18 08:10:24 http: TLS handshake error from 127.0.0.1:45346: read tcp 127.0.0.1:38459->127.0.0.1:45346: use of closed network connection -=== RUN TestRoundTripAndNewConnection/no_upgrade_header - roundtripper_test.go:318: Server URL: http://127.0.0.1:44109 -=== RUN TestRoundTripAndNewConnection/no_connection_header - roundtripper_test.go:318: Server URL: http://127.0.0.1:42841 -=== RUN TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_hostname_verification)_->_http - roundtripper_test.go:318: Server URL: http://127.0.0.1:36699 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:37439 -2024/05/18 08:10:24 http: TLS handshake error from 127.0.0.1:38564: read tcp 127.0.0.1:37439->127.0.0.1:38564: use of closed network connection + http.go:142: Server write close, host=127.0.0.1:43343 + http.go:137: Server read close, host=127.0.0.1:43343 + http.go:145: Done handling CONNECT request, host=127.0.0.1:43343 === RUN TestRoundTripAndNewConnection/proxied_https_with_auth_(valid_hostname_+_RootCAs)_->_http - roundtripper_test.go:318: Server URL: http://127.0.0.1:36265 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:39475 - http.go:87: Proxy Request: CONNECT 127.0.0.1:36265 HTTP/1.1 - Host: 127.0.0.1:36265 + roundtripper_test.go:318: Server URL: http://127.0.0.1:36627 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:46303 + http.go:87: Proxy Request: CONNECT 127.0.0.1:36627 HTTP/1.1 + Host: 127.0.0.1:36627 Proxy-Authorization: Basic cHJveHl1c2VyOnByb3h5cGFzc3dk User-Agent: Go-http-client/1.1 - http.go:142: Server write close, host=127.0.0.1:36265 - http.go:137: Server read close, host=127.0.0.1:36265 - http.go:145: Done handling CONNECT request, host=127.0.0.1:36265 -=== RUN TestRoundTripAndNewConnection/no_switching_protocol_status_code - roundtripper_test.go:318: Server URL: http://127.0.0.1:44981 -=== RUN TestRoundTripAndNewConnection/http - roundtripper_test.go:318: Server URL: http://127.0.0.1:38565 + http.go:142: Server write close, host=127.0.0.1:36627 + http.go:137: Server read close, host=127.0.0.1:36627 + http.go:145: Done handling CONNECT request, host=127.0.0.1:36627 +=== RUN TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_InsecureSkipVerify)_->_https_(invalid_hostname) + roundtripper_test.go:318: Server URL: https://127.0.0.1:45137 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:34241 + http.go:87: Proxy Request: CONNECT 127.0.0.1:45137 HTTP/1.1 + Host: 127.0.0.1:45137 + User-Agent: Go-http-client/1.1 + + http.go:142: Server write close, host=127.0.0.1:45137 + http.go:137: Server read close, host=127.0.0.1:45137 + http.go:145: Done handling CONNECT request, host=127.0.0.1:45137 === RUN TestRoundTripAndNewConnection/proxied_https_with_auth_(valid_hostname_+_RootCAs)_->_https_(valid_hostname_+_RootCAs) - roundtripper_test.go:318: Server URL: https://127.0.0.1:35699 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:43717 - http.go:87: Proxy Request: CONNECT 127.0.0.1:35699 HTTP/1.1 - Host: 127.0.0.1:35699 + roundtripper_test.go:318: Server URL: https://127.0.0.1:43745 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:33327 + http.go:87: Proxy Request: CONNECT 127.0.0.1:43745 HTTP/1.1 + Host: 127.0.0.1:43745 Proxy-Authorization: Basic cHJveHl1c2VyOnByb3h5cGFzc3dk User-Agent: Go-http-client/1.1 - http.go:142: Server write close, host=127.0.0.1:35699 - http.go:137: Server read close, host=127.0.0.1:35699 - http.go:145: Done handling CONNECT request, host=127.0.0.1:35699 + http.go:137: Server read close, host=127.0.0.1:43745 + http.go:142: Server write close, host=127.0.0.1:43745 + http.go:145: Done handling CONNECT request, host=127.0.0.1:43745 === 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:35505 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:46277 - http.go:87: Proxy Request: CONNECT 127.0.0.1:35505 HTTP/1.1 - Host: 127.0.0.1:35505 + roundtripper_test.go:318: Server URL: https://127.0.0.1:43991 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:35985 + http.go:87: Proxy Request: CONNECT 127.0.0.1:43991 HTTP/1.1 + Host: 127.0.0.1:43991 Proxy-Authorization: Basic cHJveHkgdXNlcjpwcm94eXBhc3N3ZCU= User-Agent: Go-http-client/1.1 - http.go:142: Server write close, host=127.0.0.1:35505 - http.go:137: Server read close, host=127.0.0.1:35505 - http.go:145: Done handling CONNECT request, host=127.0.0.1:35505 ---- PASS: TestRoundTripAndNewConnection (1.72s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_with_auth_(invalid_hostname_+_InsecureSkipVerify)_->_http (0.19s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_(valid_hostname_+_RootCAs)_->_https_(valid_hostname_+_RootCAs) (0.33s) - --- PASS: TestRoundTripAndNewConnection/https_(invalid_hostname_+_hostname_verification) (0.10s) - --- PASS: TestRoundTripAndNewConnection/https_(valid_hostname_+_RootCAs) (0.09s) - --- PASS: TestRoundTripAndNewConnection/proxied_http->http (0.02s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_InsecureSkipVerify)_->_http (0.12s) - --- PASS: TestRoundTripAndNewConnection/no_headers (0.00s) - --- PASS: TestRoundTripAndNewConnection/https_(invalid_hostname_+_InsecureSkipVerify) (0.08s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_(valid_hostname_+_RootCAs)_->_http (0.12s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_InsecureSkipVerify)_->_https_(invalid_hostname) (0.19s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_with_auth_(invalid_hostname_+_InsecureSkipVerify)_->_https_(invalid_hostname) (0.18s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_hostname_verification)_->_https_(invalid_hostname) (0.04s) - --- PASS: TestRoundTripAndNewConnection/no_upgrade_header (0.00s) + http.go:142: Server write close, host=127.0.0.1:43991 + http.go:137: Server read close, host=127.0.0.1:43991 + http.go:145: Done handling CONNECT request, host=127.0.0.1:43991 +=== RUN TestRoundTripAndNewConnection/no_upgrade_header + roundtripper_test.go:318: Server URL: http://127.0.0.1:45255 +=== RUN TestRoundTripAndNewConnection/https_(invalid_hostname_+_InsecureSkipVerify) + roundtripper_test.go:318: Server URL: https://127.0.0.1:42871 +=== RUN TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_hostname_verification)_->_http + roundtripper_test.go:318: Server URL: http://127.0.0.1:33095 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:38231 +2024/05/18 08:21:19 http: TLS handshake error from 127.0.0.1:52522: read tcp 127.0.0.1:38231->127.0.0.1:52522: use of closed network connection +=== RUN TestRoundTripAndNewConnection/proxied_https_(valid_hostname_+_RootCAs)_->_http + roundtripper_test.go:318: Server URL: http://127.0.0.1:39711 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:43571 + http.go:87: Proxy Request: CONNECT 127.0.0.1:39711 HTTP/1.1 + Host: 127.0.0.1:39711 + User-Agent: Go-http-client/1.1 + + http.go:142: Server write close, host=127.0.0.1:39711 + http.go:137: Server read close, host=127.0.0.1:39711 + http.go:145: Done handling CONNECT request, host=127.0.0.1:39711 +=== RUN TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_hostname_verification)_->_https_(invalid_hostname) + roundtripper_test.go:318: Server URL: https://127.0.0.1:39665 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:41205 +2024/05/18 08:21:19 http: TLS handshake error from 127.0.0.1:45938: read tcp 127.0.0.1:41205->127.0.0.1:45938: use of closed network connection +=== RUN TestRoundTripAndNewConnection/http + roundtripper_test.go:318: Server URL: http://127.0.0.1:39787 +=== RUN TestRoundTripAndNewConnection/https_(invalid_hostname_+_hostname_verification) + roundtripper_test.go:318: Server URL: https://127.0.0.1:39393 +2024/05/18 08:21:19 http: TLS handshake error from 127.0.0.1:45996: read tcp 127.0.0.1:39393->127.0.0.1:45996: use of closed network connection +=== RUN TestRoundTripAndNewConnection/proxied_https_(valid_hostname_+_RootCAs)_->_https_(valid_hostname_+_RootCAs) + roundtripper_test.go:318: Server URL: https://127.0.0.1:37241 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:39591 + http.go:87: Proxy Request: CONNECT 127.0.0.1:37241 HTTP/1.1 + Host: 127.0.0.1:37241 + User-Agent: Go-http-client/1.1 + + http.go:142: Server write close, host=127.0.0.1:37241 + http.go:137: Server read close, host=127.0.0.1:37241 + http.go:145: Done handling CONNECT request, host=127.0.0.1:37241 +--- PASS: TestRoundTripAndNewConnection (2.04s) + --- PASS: TestRoundTripAndNewConnection/no_headers (0.01s) --- PASS: TestRoundTripAndNewConnection/no_connection_header (0.00s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_hostname_verification)_->_http (0.04s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_with_auth_(valid_hostname_+_RootCAs)_->_http (0.05s) + --- PASS: TestRoundTripAndNewConnection/https_(valid_hostname_+_RootCAs) (0.10s) + --- PASS: TestRoundTripAndNewConnection/proxied_http->http (0.01s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_with_auth_(invalid_hostname_+_InsecureSkipVerify)_->_https_(invalid_hostname) (0.23s) --- PASS: TestRoundTripAndNewConnection/no_switching_protocol_status_code (0.00s) - --- PASS: TestRoundTripAndNewConnection/http (0.01s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_with_auth_(valid_hostname_+_RootCAs)_->_https_(valid_hostname_+_RootCAs) (0.09s) - --- PASS: TestRoundTripAndNewConnection/proxied_valid_https,_proxy_auth_with_chars_that_percent_escape_->_valid_https (0.09s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_InsecureSkipVerify)_->_http (0.11s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_with_auth_(invalid_hostname_+_InsecureSkipVerify)_->_http (0.16s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_with_auth_(valid_hostname_+_RootCAs)_->_http (0.11s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_InsecureSkipVerify)_->_https_(invalid_hostname) (0.24s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_with_auth_(valid_hostname_+_RootCAs)_->_https_(valid_hostname_+_RootCAs) (0.20s) + --- PASS: TestRoundTripAndNewConnection/proxied_valid_https,_proxy_auth_with_chars_that_percent_escape_->_valid_https (0.07s) + --- PASS: TestRoundTripAndNewConnection/no_upgrade_header (0.00s) + --- PASS: TestRoundTripAndNewConnection/https_(invalid_hostname_+_InsecureSkipVerify) (0.11s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_hostname_verification)_->_http (0.07s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_(valid_hostname_+_RootCAs)_->_http (0.05s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_hostname_verification)_->_https_(invalid_hostname) (0.13s) + --- PASS: TestRoundTripAndNewConnection/http (0.02s) + --- PASS: TestRoundTripAndNewConnection/https_(invalid_hostname_+_hostname_verification) (0.11s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_(valid_hostname_+_RootCAs)_->_https_(valid_hostname_+_RootCAs) (0.34s) === 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 --- 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) === RUN TestRoundTripSocks5AndNewConnection +=== RUN TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(valid_hostname_+_RootCAs) === RUN TestRoundTripSocks5AndNewConnection/proxied_without_auth_->_http === RUN TestRoundTripSocks5AndNewConnection/proxied_with_invalid_auth_->_http -2024/05/18 08:10:24 [ERR] socks: Failed to authenticate: User authentication failed +2024/05/18 08:21:20 [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) === RUN TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(invalid_hostname_+_hostname_verification) -2024/05/18 08:10:24 http: TLS handshake error from 127.0.0.1:38684: read tcp 127.0.0.1:39909->127.0.0.1:38684: use of closed network connection -=== RUN TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(valid_hostname_+_RootCAs) ---- PASS: TestRoundTripSocks5AndNewConnection (0.15s) - --- PASS: TestRoundTripSocks5AndNewConnection/proxied_without_auth_->_http (0.01s) +2024/05/18 08:21:20 http: TLS handshake error from 127.0.0.1:41906: read tcp 127.0.0.1:44689->127.0.0.1:41906: use of closed network connection +--- PASS: TestRoundTripSocks5AndNewConnection (0.34s) + --- PASS: TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(valid_hostname_+_RootCAs) (0.07s) + --- PASS: TestRoundTripSocks5AndNewConnection/proxied_without_auth_->_http (0.04s) --- PASS: TestRoundTripSocks5AndNewConnection/proxied_with_invalid_auth_->_http (0.00s) - --- PASS: TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_http (0.01s) - --- PASS: TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(invalid_hostname_+_InsecureSkipVerify) (0.05s) - --- 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_with_valid_auth_->_http (0.03s) + --- PASS: TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(invalid_hostname_+_InsecureSkipVerify) (0.09s) + --- PASS: TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(invalid_hostname_+_hostname_verification) (0.10s) === RUN TestRoundTripPassesContextToDialer === RUN TestRoundTripPassesContextToDialer/http://127.0.0.1:1233/ === RUN TestRoundTripPassesContextToDialer/https://127.0.0.1:1233/ @@ -5554,13 +5590,13 @@ === RUN TestUpgradeResponse --- PASS: TestUpgradeResponse (0.01s) PASS -ok k8s.io/apimachinery/pkg/util/httpstream/spdy 1.963s +ok k8s.io/apimachinery/pkg/util/httpstream/spdy 2.581s === RUN TestRawConn ---- PASS: TestRawConn (0.01s) +--- PASS: TestRawConn (0.03s) === RUN TestBase64Conn --- PASS: TestBase64Conn (0.00s) === RUN TestVersionedConn ---- PASS: TestVersionedConn (0.02s) +--- PASS: TestVersionedConn (0.03s) === RUN TestIsWebSocketRequestWithStreamCloseProtocol --- PASS: TestIsWebSocketRequestWithStreamCloseProtocol (0.00s) === RUN TestProtocolSupportsStreamClose @@ -5572,17 +5608,17 @@ === RUN TestStreamBase64 --- PASS: TestStreamBase64 (0.00s) === RUN TestStreamVersionedBase64 ---- PASS: TestStreamVersionedBase64 (0.01s) +--- PASS: TestStreamVersionedBase64 (0.00s) === RUN TestStreamVersionedCopy --- PASS: TestStreamVersionedCopy (0.02s) === RUN TestStreamError ---- PASS: TestStreamError (0.01s) +--- PASS: TestStreamError (0.00s) === RUN TestStreamSurvivesPanic --- PASS: TestStreamSurvivesPanic (0.00s) === RUN TestStreamClosedDuringRead ---- PASS: TestStreamClosedDuringRead (0.05s) +--- PASS: TestStreamClosedDuringRead (0.07s) PASS -ok k8s.io/apimachinery/pkg/util/httpstream/wsstream 0.172s +ok k8s.io/apimachinery/pkg/util/httpstream/wsstream 0.268s === RUN TestFromInt --- PASS: TestFromInt (0.00s) === RUN TestFromInt32 @@ -5594,7 +5630,7 @@ === RUN TestIntOrStringMarshalJSON --- PASS: TestIntOrStringMarshalJSON (0.00s) === RUN TestIntOrStringMarshalJSONUnmarshalYAML ---- PASS: TestIntOrStringMarshalJSONUnmarshalYAML (0.00s) +--- PASS: TestIntOrStringMarshalJSONUnmarshalYAML (0.01s) === RUN TestGetIntFromIntOrString === RUN TestGetIntFromIntOrString/#00 === RUN TestGetIntFromIntOrString/#01 @@ -5639,7 +5675,7 @@ intstr_test.go:312: test case 8 --- PASS: TestParse (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/intstr 0.020s +ok k8s.io/apimachinery/pkg/util/intstr 0.039s === RUN TestEvaluateTypes === RUN TestEvaluateTypes/0_map === RUN TestEvaluateTypes/0_slice @@ -5746,7 +5782,7 @@ === RUN TestEvaluateTypes/34_map === RUN TestEvaluateTypes/34_slice === RUN TestEvaluateTypes/34_raw ---- PASS: TestEvaluateTypes (0.01s) +--- PASS: TestEvaluateTypes (0.03s) --- PASS: TestEvaluateTypes/0_map (0.00s) --- PASS: TestEvaluateTypes/0_slice (0.00s) --- PASS: TestEvaluateTypes/0_raw (0.00s) @@ -5798,7 +5834,7 @@ --- PASS: TestEvaluateTypes/16_map (0.00s) --- PASS: TestEvaluateTypes/16_slice (0.00s) --- PASS: TestEvaluateTypes/16_raw (0.00s) - --- PASS: TestEvaluateTypes/17_map (0.00s) + --- PASS: TestEvaluateTypes/17_map (0.01s) --- PASS: TestEvaluateTypes/17_slice (0.00s) --- PASS: TestEvaluateTypes/17_raw (0.00s) --- PASS: TestEvaluateTypes/18_map (0.00s) @@ -5844,7 +5880,7 @@ --- PASS: TestEvaluateTypes/31_slice (0.00s) --- PASS: TestEvaluateTypes/31_raw (0.00s) --- PASS: TestEvaluateTypes/32_map (0.00s) - --- PASS: TestEvaluateTypes/32_slice (0.00s) + --- PASS: TestEvaluateTypes/32_slice (0.01s) --- PASS: TestEvaluateTypes/32_raw (0.00s) --- PASS: TestEvaluateTypes/33_map (0.00s) --- PASS: TestEvaluateTypes/33_slice (0.00s) @@ -5858,21 +5894,22 @@ json_test.go:416: json: Unmarshal(nil *map[string]interface {}) --- PASS: TestUnmarshalNil (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/json 0.033s +ok k8s.io/apimachinery/pkg/util/json 0.073s === RUN TestKeepOrDeleteNullInObj ---- PASS: TestKeepOrDeleteNullInObj (0.00s) +--- PASS: TestKeepOrDeleteNullInObj (0.01s) === RUN TestCreateThreeWayJSONMergePatch ---- PASS: TestCreateThreeWayJSONMergePatch (0.02s) +--- PASS: TestCreateThreeWayJSONMergePatch (0.03s) PASS -ok k8s.io/apimachinery/pkg/util/jsonmergepatch 0.036s +ok k8s.io/apimachinery/pkg/util/jsonmergepatch 0.092s ? 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] ? k8s.io/apimachinery/pkg/util/managedfields/managedfieldstest [no test files] +? k8s.io/apimachinery/pkg/util/net/testing [no test files] === RUN TestHasConflicts --- PASS: TestHasConflicts (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/mergepatch 0.034s +ok k8s.io/apimachinery/pkg/util/mergepatch 0.050s === RUN TestGetNameFromCallsite === RUN TestGetNameFromCallsite/simple === RUN TestGetNameFromCallsite/ignore-package @@ -5884,9 +5921,7 @@ --- PASS: TestGetNameFromCallsite/ignore-file (0.00s) --- PASS: TestGetNameFromCallsite/ignore-multiple (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/naming 0.032s -? k8s.io/apimachinery/pkg/util/net/testing [no test files] -? k8s.io/apimachinery/pkg/util/remotecommand [no test files] +ok k8s.io/apimachinery/pkg/util/naming 0.035s === RUN TestGetClientIP --- PASS: TestGetClientIP (0.00s) === RUN TestAppendForwardedForHeader @@ -5957,7 +5992,7 @@ === RUN TestSourceIPs/full_redundancy === RUN TestSourceIPs/full_ipv6 === RUN TestSourceIPs/mixed_ipv4_ipv6 ---- PASS: TestSourceIPs (0.00s) +--- PASS: TestSourceIPs (0.02s) --- PASS: TestSourceIPs/no_headers,_missing_remoteAddr (0.00s) --- PASS: TestSourceIPs/no_headers,_just_remoteAddr_host:port (0.00s) --- PASS: TestSourceIPs/no_headers,_just_remoteAddr_host (0.00s) @@ -6086,10 +6121,10 @@ --- PASS: TestIsProbableEOF/with_url_error (0.00s) --- PASS: TestIsProbableEOF/with_unrecognized_error (0.00s) === RUN TestReadIdleTimeoutSeconds -W0518 08:11:22.588985 27315 http.go:151] Illegal HTTP2_READ_IDLE_TIMEOUT_SECONDS("illegal value"): strconv.Atoi: parsing "illegal value": invalid syntax. Default value 30 is used +W0518 08:22:02.911800 24586 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 -W0518 08:11:22.589213 27315 http.go:165] Illegal HTTP2_PING_TIMEOUT_SECONDS("illegal value"): strconv.Atoi: parsing "illegal value": invalid syntax. Default value 15 is used +W0518 08:22:02.911990 24586 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) @@ -6120,7 +6155,7 @@ === RUN TestGetAllDefaultRoutesFailNoV4RouteFile --- PASS: TestGetAllDefaultRoutesFailNoV4RouteFile (0.00s) === RUN TestGetAllDefaultRoutes ---- PASS: TestGetAllDefaultRoutes (0.10s) +--- PASS: TestGetAllDefaultRoutes (0.05s) === RUN TestPortRange --- PASS: TestPortRange (0.00s) === RUN TestSplitSchemeNamePort @@ -6130,47 +6165,48 @@ === RUN TestIsConnectionRefused --- PASS: TestIsConnectionRefused (0.00s) === RUN TestIsConnectionReset ---- PASS: TestIsConnectionReset (2.12s) +--- PASS: TestIsConnectionReset (2.13s) PASS -ok k8s.io/apimachinery/pkg/util/net 2.271s +ok k8s.io/apimachinery/pkg/util/net 2.273s +? k8s.io/apimachinery/pkg/util/remotecommand [no test files] === RUN TestDialURL -2024/05/18 08:11:23 http: TLS handshake error from 127.0.0.1:58074: read tcp 127.0.0.1:35653->127.0.0.1:58074: use of closed network connection -2024/05/18 08:11:23 http: TLS handshake error from 127.0.0.1:48138: remote error: tls: bad certificate -2024/05/18 08:11:23 http: TLS handshake error from 127.0.0.1:33506: remote error: tls: bad certificate -2024/05/18 08:11:23 http: TLS handshake error from 127.0.0.1:36194: read tcp 127.0.0.1:44769->127.0.0.1:36194: use of closed network connection -2024/05/18 08:11:23 http: TLS handshake error from 127.0.0.1:33702: read tcp 127.0.0.1:39801->127.0.0.1:33702: use of closed network connection -2024/05/18 08:11:23 http: TLS handshake error from 127.0.0.1:51532: read tcp 127.0.0.1:46719->127.0.0.1:51532: use of closed network connection -2024/05/18 08:11:23 http: TLS handshake error from 127.0.0.1:59478: read tcp 127.0.0.1:44801->127.0.0.1:59478: use of closed network connection -2024/05/18 08:11:24 http: TLS handshake error from 127.0.0.1:40408: read tcp 127.0.0.1:43861->127.0.0.1:40408: use of closed network connection -2024/05/18 08:11:24 http: TLS handshake error from 127.0.0.1:60718: read tcp 127.0.0.1:36743->127.0.0.1:60718: use of closed network connection -2024/05/18 08:11:24 http: TLS handshake error from 127.0.0.1:47832: read tcp 127.0.0.1:42283->127.0.0.1:47832: use of closed network connection ---- PASS: TestDialURL (1.21s) +2024/05/18 08:22:09 http: TLS handshake error from 127.0.0.1:38658: read tcp 127.0.0.1:39875->127.0.0.1:38658: use of closed network connection +2024/05/18 08:22:09 http: TLS handshake error from 127.0.0.1:48464: read tcp 127.0.0.1:33217->127.0.0.1:48464: use of closed network connection +2024/05/18 08:22:09 http: TLS handshake error from 127.0.0.1:53088: read tcp 127.0.0.1:45405->127.0.0.1:53088: use of closed network connection +2024/05/18 08:22:09 http: TLS handshake error from 127.0.0.1:53946: read tcp 127.0.0.1:34523->127.0.0.1:53946: use of closed network connection +2024/05/18 08:22:09 http: TLS handshake error from 127.0.0.1:51852: read tcp 127.0.0.1:41215->127.0.0.1:51852: use of closed network connection +2024/05/18 08:22:09 http: TLS handshake error from 127.0.0.1:35070: read tcp 127.0.0.1:39041->127.0.0.1:35070: use of closed network connection +2024/05/18 08:22:09 http: TLS handshake error from 127.0.0.1:41402: read tcp 127.0.0.1:45149->127.0.0.1:41402: use of closed network connection +2024/05/18 08:22:09 http: TLS handshake error from 127.0.0.1:53030: read tcp 127.0.0.1:35063->127.0.0.1:53030: use of closed network connection +2024/05/18 08:22:09 http: TLS handshake error from 127.0.0.1:36828: read tcp 127.0.0.1:34821->127.0.0.1:36828: use of closed network connection +2024/05/18 08:22:10 http: TLS handshake error from 127.0.0.1:46602: read tcp 127.0.0.1:44807->127.0.0.1:46602: use of closed network connection +--- PASS: TestDialURL (1.02s) === RUN TestProxyTransport ---- PASS: TestProxyTransport (0.04s) +--- PASS: TestProxyTransport (0.09s) === RUN TestRewriteResponse ---- PASS: TestRewriteResponse (0.02s) +--- PASS: TestRewriteResponse (0.04s) === RUN TestServeHTTP -E0518 08:11:24.318274 27332 upgradeaware.go:364] Proxy upgrade error: invalid upgrade response: status code 200 ---- PASS: TestServeHTTP (0.04s) +E0518 08:22:10.366664 24911 upgradeaware.go:364] Proxy upgrade error: invalid upgrade response: status code 200 +--- PASS: TestServeHTTP (0.09s) === RUN TestProxyUpgrade ---- PASS: TestProxyUpgrade (0.31s) +--- PASS: TestProxyUpgrade (0.40s) === RUN TestProxyUpgradeConnectionErrorResponse --- PASS: TestProxyUpgradeConnectionErrorResponse (0.00s) === RUN TestProxyUpgradeErrorResponseTerminates === RUN TestProxyUpgradeErrorResponseTerminates/code=400 === RUN TestProxyUpgradeErrorResponseTerminates/code=500 ---- PASS: TestProxyUpgradeErrorResponseTerminates (2.02s) +--- PASS: TestProxyUpgradeErrorResponseTerminates (2.01s) --- PASS: TestProxyUpgradeErrorResponseTerminates/code=400 (1.00s) - --- PASS: TestProxyUpgradeErrorResponseTerminates/code=500 (1.02s) + --- PASS: TestProxyUpgradeErrorResponseTerminates/code=500 (1.00s) === RUN TestProxyUpgradeErrorResponse === RUN TestProxyUpgradeErrorResponse/code=200 -E0518 08:11:26.669961 27332 upgradeaware.go:364] Proxy upgrade error: invalid upgrade response: status code 200 +E0518 08:22:12.794222 24911 upgradeaware.go:364] Proxy upgrade error: invalid upgrade response: status code 200 === RUN TestProxyUpgradeErrorResponse/code=300 -E0518 08:11:26.672516 27332 upgradeaware.go:364] Proxy upgrade error: invalid upgrade response: status code 300 +E0518 08:22:12.797543 24911 upgradeaware.go:364] Proxy upgrade error: invalid upgrade response: status code 300 === RUN TestProxyUpgradeErrorResponse/code=302 -E0518 08:11:26.674810 27332 upgradeaware.go:364] Proxy upgrade error: invalid upgrade response: status code 302 +E0518 08:22:12.798972 24911 upgradeaware.go:364] Proxy upgrade error: invalid upgrade response: status code 302 === RUN TestProxyUpgradeErrorResponse/code=307 -E0518 08:11:26.677842 27332 upgradeaware.go:364] Proxy upgrade error: invalid upgrade response: status code 307 +E0518 08:22:12.800395 24911 upgradeaware.go:364] 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) @@ -6183,17 +6219,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.04s) - --- PASS: TestRejectForwardingRedirectsOption/reject_redirection_enabled_in_proxy,_backend_server_sending_200_response (0.02s) +--- PASS: TestRejectForwardingRedirectsOption (0.02s) + --- PASS: TestRejectForwardingRedirectsOption/reject_redirection_enabled_in_proxy,_backend_server_sending_200_response (0.01s) --- 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.01s) + --- 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.00s) === RUN TestDefaultProxyTransport --- PASS: TestDefaultProxyTransport (0.00s) === RUN TestProxyRequestContentLengthAndTransferEncoding ---- PASS: TestProxyRequestContentLengthAndTransferEncoding (0.03s) +--- PASS: TestProxyRequestContentLengthAndTransferEncoding (0.08s) === RUN TestFlushIntervalHeaders --- PASS: TestFlushIntervalHeaders (0.01s) === RUN TestErrorPropagation @@ -6201,7 +6237,7 @@ === RUN TestProxyRedirectsforRootPath --- PASS: TestProxyRedirectsforRootPath (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/proxy 4.235s +ok k8s.io/apimachinery/pkg/util/proxy 3.892s === RUN TestString --- PASS: TestString (0.00s) === RUN TestRangePanic @@ -6213,21 +6249,21 @@ === RUN TestIntnRange --- PASS: TestIntnRange (0.00s) === RUN TestInt63nRange ---- PASS: TestInt63nRange (0.00s) +--- PASS: TestInt63nRange (0.01s) PASS -ok k8s.io/apimachinery/pkg/util/rand 0.032s +ok k8s.io/apimachinery/pkg/util/rand 0.046s === RUN TestHandleCrash -E0518 08:11:28.853454 27392 runtime.go:77] Observed a panic: Test Panic -goroutine 6 [running]: +E0518 08:22:09.099325 24913 runtime.go:77] Observed a panic: Test Panic +goroutine 19 [running]: k8s.io/apimachinery/pkg/util/runtime.logPanic({0x1c4028, 0x22e9fc}) /build/reproducible-path/golang-k8s-apimachinery-0.29.0/_build/src/k8s.io/apimachinery/pkg/util/runtime/runtime.go:75 +0x94 k8s.io/apimachinery/pkg/util/runtime.HandleCrash({0x0, 0x0, 0x0}) /build/reproducible-path/golang-k8s-apimachinery-0.29.0/_build/src/k8s.io/apimachinery/pkg/util/runtime/runtime.go:49 +0x74 panic({0x1c4028, 0x22e9fc}) /usr/lib/go-1.22/src/runtime/panic.go:770 +0xfc -k8s.io/apimachinery/pkg/util/runtime.TestHandleCrash(0x20b6108) +k8s.io/apimachinery/pkg/util/runtime.TestHandleCrash(0x1ce6108) /build/reproducible-path/golang-k8s-apimachinery-0.29.0/_build/src/k8s.io/apimachinery/pkg/util/runtime/runtime_test.go:39 +0x78 -testing.tRunner(0x20b6108, 0x1ff034) +testing.tRunner(0x1ce6108, 0x1ff034) /usr/lib/go-1.22/src/testing/testing.go:1689 +0x128 created by testing.(*T).Run in goroutine 1 /usr/lib/go-1.22/src/testing/testing.go:1742 +0x3c4 @@ -6241,9 +6277,9 @@ === RUN TestHandleCrashLogSilenceHTTPErrAbortHandler --- PASS: TestHandleCrashLogSilenceHTTPErrAbortHandler (0.00s) === RUN Test_rudimentaryErrorBackoff_OnError_ParallelSleep ---- PASS: Test_rudimentaryErrorBackoff_OnError_ParallelSleep (1.01s) +--- PASS: Test_rudimentaryErrorBackoff_OnError_ParallelSleep (1.00s) PASS -ok k8s.io/apimachinery/pkg/util/runtime 1.032s +ok k8s.io/apimachinery/pkg/util/runtime 1.064s === RUN TestStringSet --- PASS: TestStringSet (0.00s) === RUN TestStringSetDeleteMultiples @@ -6295,156 +6331,157 @@ === RUN TestIntersection --- PASS: TestIntersection (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/sets 0.037s +ok k8s.io/apimachinery/pkg/util/sets 0.015s ? k8s.io/apimachinery/pkg/util/strategicpatch/testing [no test files] ? k8s.io/apimachinery/pkg/util/uuid [no test files] +? k8s.io/apimachinery/third_party/forked/golang/netutil [no test files] === RUN TestSortMergeLists ---- PASS: TestSortMergeLists (0.03s) +--- PASS: TestSortMergeLists (0.04s) === 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([replacingItem_retainKeysMap_name_value_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_other_mergingIntList_simpleMap_retainKeysMergingList]) +=== RUN TestCustomStrategicMergePatch/unique_scalars_when_merging_lists/Kind([nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingList_mergingIntList_mergeItemPtr]) === 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([other_mergingIntList_simpleMap_retainKeysMergingList_name_value_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap]) +=== RUN TestCustomStrategicMergePatch/delete_map_from_nested_map/Kind([name_value_other_mergingList_mergingIntList_mergeItemPtr_nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList]) === 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([simpleMap_retainKeysMergingList_other_mergingIntList_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value]) +=== RUN TestCustomStrategicMergePatch/delete_all_items_from_merging_list/Kind([nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingList_mergingIntList_mergeItemPtr]) === 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_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_other_mergingIntList_simpleMap_retainKeysMergingList]) +=== RUN TestCustomStrategicMergePatch/merge_empty_merging_lists/Kind([nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingList_mergingIntList_mergeItemPtr]) === 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([value_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_mergingIntList_simpleMap_retainKeysMergingList_other]) +=== RUN TestCustomStrategicMergePatch/delete_all_keys_from_map/Kind([nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingList_mergingIntList_mergeItemPtr]) === 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([mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_simpleMap_retainKeysMergingList_other_mergingIntList]) +=== RUN TestCustomStrategicMergePatch/add_key_and_delete_all_keys_from_map/Kind([name_value_other_mergingList_mergingIntList_mergeItemPtr_nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_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([nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingList_nonMergingList_other_mergingIntList_simpleMap_retainKeysMergingList]) +=== RUN TestCustomStrategicMergePatch/delete_all_duplicate_entries_in_a_merging_list/Kind([retainKeysMergingList_nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_mergeItemPtr_name_value_other_mergingList_mergingIntList]) === 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([mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingList_nonMergingList_nonMergingIntList_other_mergingIntList_simpleMap_retainKeysMergingList]) +=== RUN TestCustomStrategicMergePatch/retainKeys_map_can_add_a_field_when_no_retainKeys_directive_present/Kind([retainKeysMap_retainKeysMergingList_nonMergingList_nonMergingIntList_simpleMap_replacingItem_mergingIntList_mergeItemPtr_name_value_other_mergingList]) === 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([mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_simpleMap_retainKeysMergingList_other_mergingIntList]) +=== RUN TestCustomStrategicMergePatch/retainKeys_map_can_change_a_field_when_no_retainKeys_directive_present/Kind([nonMergingIntList_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_nonMergingList_value_other_mergingList_mergingIntList_mergeItemPtr_name]) === 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([other_mergingIntList_simpleMap_retainKeysMergingList_name_value_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap]) +=== RUN TestCustomStrategicMergePatch/retainKeys_map_can_delete_a_field_when_no_retainKeys_directive_present/Kind([mergingList_mergingIntList_mergeItemPtr_name_value_other_replacingItem_retainKeysMap_retainKeysMergingList_nonMergingList_nonMergingIntList_simpleMap]) === 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([other_mergingIntList_simpleMap_retainKeysMergingList_replacingItem_retainKeysMap_name_value_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr]) +=== RUN TestCustomStrategicMergePatch/retainKeys_map_merge_an_empty_map/Kind([nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingList_mergingIntList_mergeItemPtr]) === 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_mergingIntList_simpleMap_retainKeysMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingList_nonMergingList]) +=== RUN TestCustomStrategicMergePatch/retainKeys_list_can_add_a_field_when_no_retainKeys_directive_present/Kind([retainKeysMergingList_nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_mergeItemPtr_name_value_other_mergingList_mergingIntList]) === 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([replacingItem_retainKeysMap_name_value_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_other_mergingIntList_simpleMap_retainKeysMergingList]) +=== RUN TestCustomStrategicMergePatch/retainKeys_list_can_change_a_field_when_no_retainKeys_directive_present/Kind([other_mergingList_mergingIntList_mergeItemPtr_name_value_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_nonMergingList_nonMergingIntList]) === 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([value_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_mergingIntList_simpleMap_retainKeysMergingList_other]) +=== RUN TestCustomStrategicMergePatch/retainKeys_list_can_delete_a_field_when_no_retainKeys_directive_present/Kind([name_value_other_mergingList_mergingIntList_mergeItemPtr_nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList]) === 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_mergingList_nonMergingList_other_mergingIntList_simpleMap_retainKeysMergingList]) +=== RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list/Kind([nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingList_mergingIntList_mergeItemPtr]) === 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([mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_simpleMap_retainKeysMergingList_other_mergingIntList]) +=== RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list_2/Kind([simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_nonMergingList_nonMergingIntList_other_mergingList_mergingIntList_mergeItemPtr_name_value]) === 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([mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingList_nonMergingList_nonMergingIntList_other_mergingIntList_simpleMap_retainKeysMergingList]) +=== RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list/Kind([nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingList_mergingIntList_mergeItemPtr]) === 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([replacingItem_retainKeysMap_name_value_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_other_mergingIntList_simpleMap_retainKeysMergingList]) +=== RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list#01/Kind([nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingList_mergingIntList_mergeItemPtr]) === RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list#01/Struct ---- PASS: TestCustomStrategicMergePatch (0.51s) - --- PASS: TestCustomStrategicMergePatch/unique_scalars_when_merging_lists (0.02s) +--- PASS: TestCustomStrategicMergePatch (0.26s) + --- PASS: TestCustomStrategicMergePatch/unique_scalars_when_merging_lists (0.01s) --- PASS: TestCustomStrategicMergePatch/unique_scalars_when_merging_lists/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/unique_scalars_when_merging_lists/Kind([replacingItem_retainKeysMap_name_value_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_other_mergingIntList_simpleMap_retainKeysMergingList]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/unique_scalars_when_merging_lists/Kind([nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingList_mergingIntList_mergeItemPtr]) (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.03s) --- PASS: TestCustomStrategicMergePatch/delete_map_from_nested_map/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/delete_map_from_nested_map/Kind([other_mergingIntList_simpleMap_retainKeysMergingList_name_value_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/delete_map_from_nested_map/Kind([name_value_other_mergingList_mergingIntList_mergeItemPtr_nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList]) (0.00s) --- PASS: TestCustomStrategicMergePatch/delete_map_from_nested_map/Struct (0.00s) --- PASS: TestCustomStrategicMergePatch/delete_all_items_from_merging_list (0.04s) --- PASS: TestCustomStrategicMergePatch/delete_all_items_from_merging_list/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/delete_all_items_from_merging_list/Kind([simpleMap_retainKeysMergingList_other_mergingIntList_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/delete_all_items_from_merging_list/Kind([nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingList_mergingIntList_mergeItemPtr]) (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_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_other_mergingIntList_simpleMap_retainKeysMergingList]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/merge_empty_merging_lists/Kind([nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingList_mergingIntList_mergeItemPtr]) (0.00s) --- PASS: TestCustomStrategicMergePatch/merge_empty_merging_lists/Struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/delete_all_keys_from_map (0.02s) + --- 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([value_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_mergingIntList_simpleMap_retainKeysMergingList_other]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/delete_all_keys_from_map/Kind([nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingList_mergingIntList_mergeItemPtr]) (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([mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_simpleMap_retainKeysMergingList_other_mergingIntList]) (0.01s) + --- PASS: TestCustomStrategicMergePatch/add_key_and_delete_all_keys_from_map/Kind([name_value_other_mergingList_mergingIntList_mergeItemPtr_nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_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.04s) + --- 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([nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingList_nonMergingList_other_mergingIntList_simpleMap_retainKeysMergingList]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/delete_all_duplicate_entries_in_a_merging_list/Kind([retainKeysMergingList_nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_mergeItemPtr_name_value_other_mergingList_mergingIntList]) (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.02s) + --- 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([mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingList_nonMergingList_nonMergingIntList_other_mergingIntList_simpleMap_retainKeysMergingList]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_add_a_field_when_no_retainKeys_directive_present/Kind([retainKeysMap_retainKeysMergingList_nonMergingList_nonMergingIntList_simpleMap_replacingItem_mergingIntList_mergeItemPtr_name_value_other_mergingList]) (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.04s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_change_a_field_when_no_retainKeys_directive_present (0.01s) --- 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([mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_simpleMap_retainKeysMergingList_other_mergingIntList]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_change_a_field_when_no_retainKeys_directive_present/Kind([nonMergingIntList_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_nonMergingList_value_other_mergingList_mergingIntList_mergeItemPtr_name]) (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([other_mergingIntList_simpleMap_retainKeysMergingList_name_value_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_delete_a_field_when_no_retainKeys_directive_present/Kind([mergingList_mergingIntList_mergeItemPtr_name_value_other_replacingItem_retainKeysMap_retainKeysMergingList_nonMergingList_nonMergingIntList_simpleMap]) (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.02s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_map_merge_an_empty_map (0.01s) --- PASS: TestCustomStrategicMergePatch/retainKeys_map_merge_an_empty_map/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_map_merge_an_empty_map/Kind([other_mergingIntList_simpleMap_retainKeysMergingList_replacingItem_retainKeysMap_name_value_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_map_merge_an_empty_map/Kind([nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingList_mergingIntList_mergeItemPtr]) (0.00s) --- 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_mergingIntList_simpleMap_retainKeysMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingList_nonMergingList]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_add_a_field_when_no_retainKeys_directive_present/Kind([retainKeysMergingList_nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_mergeItemPtr_name_value_other_mergingList_mergingIntList]) (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.02s) + --- 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([replacingItem_retainKeysMap_name_value_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_other_mergingIntList_simpleMap_retainKeysMergingList]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_change_a_field_when_no_retainKeys_directive_present/Kind([other_mergingList_mergingIntList_mergeItemPtr_name_value_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_nonMergingList_nonMergingIntList]) (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.02s) + --- 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([value_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_mergingIntList_simpleMap_retainKeysMergingList_other]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_delete_a_field_when_no_retainKeys_directive_present/Kind([name_value_other_mergingList_mergingIntList_mergeItemPtr_nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList]) (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.03s) + --- 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_mergingList_nonMergingList_other_mergingIntList_simpleMap_retainKeysMergingList]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list/Kind([nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingList_mergingIntList_mergeItemPtr]) (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.02s) + --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list_2 (0.01s) --- 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([mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMap_name_value_simpleMap_retainKeysMergingList_other_mergingIntList]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list_2/Kind([simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_nonMergingList_nonMergingIntList_other_mergingList_mergingIntList_mergeItemPtr_name_value]) (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.04s) + --- 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([mergeItemPtr_replacingItem_retainKeysMap_name_value_mergingList_nonMergingList_nonMergingIntList_other_mergingIntList_simpleMap_retainKeysMergingList]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list/Kind([nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingList_mergingIntList_mergeItemPtr]) (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.04s) + --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list#01 (0.03s) --- 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([replacingItem_retainKeysMap_name_value_mergingList_nonMergingList_nonMergingIntList_mergeItemPtr_other_mergingIntList_simpleMap_retainKeysMergingList]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list#01/Kind([nonMergingList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_name_value_other_mergingList_mergingIntList_mergeItemPtr]) (0.00s) --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list#01/Struct (0.00s) === RUN TestStrategicMergePatch === RUN TestStrategicMergePatch/struct @@ -8372,51 +8409,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([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList]) -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/nil_original/TwoWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/nil_original/ThreeWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/nil_patch/TwoWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/nil_patch/ThreeWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/add_field_to_map/TwoWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/add_field_to_map/ThreeWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/add_field_to_map_with_conflict/TwoWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/add_field_to_map_with_conflict/ThreeWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/add_field_and_delete_field_from_map/TwoWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/add_field_and_delete_field_from_map/ThreeWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/add_field_and_delete_field_from_map_with_conflict/TwoWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/add_field_and_delete_field_from_map_with_conflict/ThreeWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_field_from_nested_map/TwoWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_field_from_nested_map/ThreeWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_field_from_nested_map_with_conflict/TwoWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_field_from_nested_map_with_conflict/ThreeWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_all_fields_from_map/TwoWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_all_fields_from_map/ThreeWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_all_fields_from_map_with_conflict/TwoWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_all_fields_from_map_with_conflict/ThreeWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/add_field_and_delete_all_fields_from_map/TwoWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/add_field_and_delete_all_fields_from_map/ThreeWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/add_field_and_delete_all_fields_from_map_with_conflict/TwoWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/add_field_and_delete_all_fields_from_map_with_conflict/ThreeWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/replace_list_of_scalars/TwoWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/replace_list_of_scalars/ThreeWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/replace_list_of_scalars_with_conflict/TwoWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/replace_list_of_scalars_with_conflict/ThreeWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_all_maps_from_merging_list/TwoWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_all_maps_from_merging_list/ThreeWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_all_maps_from_merging_list_with_conflict/TwoWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_all_maps_from_merging_list_with_conflict/ThreeWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_all_maps_from_empty_merging_list/TwoWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_all_maps_from_empty_merging_list/ThreeWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/merge_empty_merging_lists/TwoWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/merge_empty_merging_lists/ThreeWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/TwoWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/ThreeWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/defined_null_values_should_propagate_removing_original_fields/TwoWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/defined_null_values_should_propagate_removing_original_fields/ThreeWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/nil_patch_with_retainKeys_map/TwoWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/nil_patch_with_retainKeys_map/ThreeWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/retainKeys_map_with_no_change_should_not_be_present/TwoWay -=== RUN TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/retainKeys_map_with_no_change_should_not_be_present/ThreeWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap]) +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/nil_original/TwoWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/nil_original/ThreeWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/nil_patch/TwoWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/nil_patch/ThreeWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/add_field_to_map/TwoWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/add_field_to_map/ThreeWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/add_field_to_map_with_conflict/TwoWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/add_field_to_map_with_conflict/ThreeWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/add_field_and_delete_field_from_map/TwoWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/add_field_and_delete_field_from_map/ThreeWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/add_field_and_delete_field_from_map_with_conflict/TwoWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/add_field_and_delete_field_from_map_with_conflict/ThreeWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_field_from_nested_map/TwoWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_field_from_nested_map/ThreeWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_field_from_nested_map_with_conflict/TwoWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_field_from_nested_map_with_conflict/ThreeWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_all_fields_from_map/TwoWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_all_fields_from_map/ThreeWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_all_fields_from_map_with_conflict/TwoWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_all_fields_from_map_with_conflict/ThreeWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/add_field_and_delete_all_fields_from_map/TwoWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/add_field_and_delete_all_fields_from_map/ThreeWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/add_field_and_delete_all_fields_from_map_with_conflict/TwoWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/add_field_and_delete_all_fields_from_map_with_conflict/ThreeWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/replace_list_of_scalars/TwoWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/replace_list_of_scalars/ThreeWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/replace_list_of_scalars_with_conflict/TwoWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/replace_list_of_scalars_with_conflict/ThreeWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_all_maps_from_merging_list/TwoWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_all_maps_from_merging_list/ThreeWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_all_maps_from_merging_list_with_conflict/TwoWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_all_maps_from_merging_list_with_conflict/ThreeWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_all_maps_from_empty_merging_list/TwoWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_all_maps_from_empty_merging_list/ThreeWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/merge_empty_merging_lists/TwoWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/merge_empty_merging_lists/ThreeWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/TwoWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/ThreeWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/defined_null_values_should_propagate_removing_original_fields/TwoWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/defined_null_values_should_propagate_removing_original_fields/ThreeWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/nil_patch_with_retainKeys_map/TwoWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/nil_patch_with_retainKeys_map/ThreeWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/retainKeys_map_with_no_change_should_not_be_present/TwoWay +=== RUN TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/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 @@ -12222,8 +12259,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 (15.58s) - --- PASS: TestStrategicMergePatch/struct (0.06s) +--- PASS: TestStrategicMergePatch (13.99s) + --- PASS: TestStrategicMergePatch/struct (0.03s) --- PASS: TestStrategicMergePatch/struct/nil_original/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/struct/nil_original/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/struct/nil_patch/TwoWay (0.00s) @@ -12231,7 +12268,7 @@ --- PASS: TestStrategicMergePatch/struct/add_field_to_map/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/struct/add_field_to_map/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/struct/add_field_to_map_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/struct/add_field_to_map_with_conflict/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/struct/add_field_to_map_with_conflict/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/struct/add_field_and_delete_field_from_map/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/struct/add_field_and_delete_field_from_map/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/struct/add_field_and_delete_field_from_map_with_conflict/TwoWay (0.00s) @@ -12243,7 +12280,7 @@ --- 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/ThreeWay (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) --- PASS: TestStrategicMergePatch/struct/add_field_and_delete_all_fields_from_map_with_conflict/TwoWay (0.00s) @@ -12253,9 +12290,9 @@ --- 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.01s) + --- PASS: TestStrategicMergePatch/struct/delete_all_maps_from_merging_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/struct/delete_all_maps_from_merging_list_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/struct/delete_all_maps_from_merging_list_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/struct/delete_all_maps_from_merging_list_with_conflict/ThreeWay (0.01s) --- PASS: TestStrategicMergePatch/struct/delete_all_maps_from_empty_merging_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/struct/delete_all_maps_from_empty_merging_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/struct/merge_empty_merging_lists/TwoWay (0.00s) @@ -12263,7 +12300,7 @@ --- 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.01s) + --- PASS: TestStrategicMergePatch/struct/defined_null_values_should_propagate_removing_original_fields/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/struct/nil_patch_with_retainKeys_map/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/struct/nil_patch_with_retainKeys_map/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/struct/retainKeys_map_with_no_change_should_not_be_present/TwoWay (0.00s) @@ -12272,57 +12309,57 @@ --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay (0.00s) --- 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.01s) + --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay (0.01s) --- 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.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay (0.01s) + --- 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) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay (0.00s) --- 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/ThreeWay (0.01s) --- 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.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) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay (0.02s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay (0.01s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay (0.03s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay (0.01s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay (0.02s) + --- 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.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay (0.01s) --- 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.01s) + --- 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) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay (0.01s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay (0.00s) --- 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.02s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay (0.01s) --- 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/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay (0.02s) + --- 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) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay (0.01s) @@ -12330,14 +12367,14 @@ --- 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.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay (0.02s) + --- 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) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay (0.00s) --- 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/ThreeWay (0.01s) --- 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.03s) + --- 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) @@ -12347,43 +12384,43 @@ --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay (0.01s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay (0.01s) --- 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.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay (0.01s) + --- 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_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) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay (0.02s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay (0.00s) --- 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/set_elements_order_in_a_int_list/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay (0.01s) --- 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) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay (0.01s) + --- 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.00s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay (0.01s) --- 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) @@ -12394,8 +12431,8 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay (0.00s) --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_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_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) @@ -12406,31 +12443,31 @@ --- 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) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay (0.00s) --- 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.01s) + --- 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_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.01s) + --- 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_adds_an_item_in_nested_merging_list/TwoWay (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.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay (0.00s) @@ -12439,19 +12476,19 @@ --- 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_with_conflict/TwoWay (0.00s) + --- 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.01s) --- 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) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay (0.00s) --- 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) @@ -12459,22 +12496,22 @@ --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#01 (0.00s) --- 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.01s) + --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#01 (0.01s) --- 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.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#01 (0.01s) --- 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.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.04s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#01 (0.00s) @@ -12487,69 +12524,69 @@ --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#01 (0.01s) --- 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) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#01 (0.02s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#01 (0.00s) --- 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_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) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#01 (0.01s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#01 (0.03s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_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/TwoWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#01 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#01 (0.01s) - --- 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_value_conflict/ThreeWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#02 (0.01s) --- 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.02s) + --- 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.00s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#01 (0.01s) --- 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.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#01 (0.01s) --- 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) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#01 (0.00s) --- 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.02s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#01 (0.01s) + --- 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.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#01 (0.00s) --- 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/TwoWay#01 (0.01s) --- 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.01s) + --- 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.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_2/ThreeWay#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) @@ -12558,7 +12595,7 @@ --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#01 (0.01s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#01 (0.00s) @@ -12566,46 +12603,46 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#01 (0.01s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#01 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#01 (0.00s) --- 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_deletes_a_field_and_clears_a_field/ThreeWay#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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#01 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#01 (0.02s) --- 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.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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#01 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#01 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#01 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#01 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#01 (0.00s) @@ -12616,32 +12653,32 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#01 (0.00s) + --- 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.02s) --- 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_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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#01 (0.01s) + --- 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) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#01 (0.00s) --- 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.02s) + --- 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/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.01s) + --- 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.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.01s) + --- 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) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#01 (0.00s) --- 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) @@ -12653,7 +12690,7 @@ --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#02 (0.01s) + --- 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.00s) @@ -12661,19 +12698,19 @@ --- 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_with_conflict/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#02 (0.03s) + --- 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.02s) + --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#02 (0.02s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#02 (0.00s) @@ -12686,79 +12723,79 @@ --- 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.02s) + --- 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.02s) + --- 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.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.02s) + --- 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.02s) --- 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.02s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#04 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#02 (0.03s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#04 (0.01s) + --- 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.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#05 (0.03s) --- 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.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#02 (0.02s) --- 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.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#02 (0.02s) --- 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) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#02 (0.01s) --- 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.01s) + --- 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.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/delete_an_item_in_a_list_and_preserve_order/ThreeWay#02 (0.03s) --- 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.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#02 (0.01s) + --- 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/TwoWay#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/ThreeWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#02 (0.03s) --- 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) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#02 (0.03s) --- 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/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) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#02 (0.02s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#02 (0.00s) @@ -12766,7 +12803,7 @@ --- 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.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/TwoWay#02 (0.01s) --- 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) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#02 (0.00s) @@ -12774,26 +12811,26 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#02 (0.01s) --- 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.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.01s) + --- 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.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#02 (0.01s) --- 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/ThreeWay#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) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#02 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#02 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#02 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#02 (0.00s) @@ -12805,7 +12842,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) @@ -12817,8 +12854,8 @@ --- 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_with_conflict/TwoWay#02 (0.00s) - --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#02 (0.01s) + --- 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.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) @@ -12827,77 +12864,77 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#03 (0.01s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#03 (0.02s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#03 (0.03s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#06 (0.02s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#07 (0.00s) --- 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.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#03 (0.02s) --- 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.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_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#03 (0.02s) --- 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.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/TwoWay#03 (0.02s) + --- 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) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#03 (0.02s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#03 (0.02s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#03 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#03 (0.00s) + --- 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.02s) --- 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_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/ThreeWay#03 (0.03s) --- 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/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#03 (0.02s) --- 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.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#03 (0.01s) - --- 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_value_conflict/TwoWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#03 (0.02s) --- 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) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#03 (0.00s) - --- 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#06 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_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_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.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.01s) + --- 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) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#03 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#03 (0.00s) @@ -12909,21 +12946,21 @@ --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#03 (0.00s) --- 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.01s) + --- 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.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) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#03 (0.00s) @@ -12942,7 +12979,7 @@ --- 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/ThreeWay#03 (0.00s) @@ -12957,63 +12994,63 @@ --- 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.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/ThreeWay#03 (0.01s) --- 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_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) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#03 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#03 (0.03s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#03 (0.00s) --- 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_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#03 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#03 (0.00s) --- 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.01s) + --- 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) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#03 (0.01s) --- 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_nested_merging_int_list_with_no_change/TwoWay#03 (0.00s) + --- 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.03s) --- 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) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#03 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#03 (0.02s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#03 (0.00s) --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#03 (0.00s) --- 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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#03 (0.02s) --- 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.02s) --- 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) @@ -13025,71 +13062,71 @@ --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#04 (0.02s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#04 (0.01s) + --- 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/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/ThreeWay#09 (0.01s) --- 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.00s) --- 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.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#04 (0.00s) --- 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) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#04 (0.01s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#04 (0.00s) --- 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/ThreeWay#04 (0.01s) --- 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/delete_field_from_map_in_merging_list/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#04 (0.01s) + --- 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) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#04 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#04 (0.00s) + --- 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.01s) --- 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.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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#04 (0.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#04 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_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_with_deletion_conflict/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#09 (0.00s) --- 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.00s) --- 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/ThreeWay#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/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#04 (0.01s) --- 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) @@ -13105,7 +13142,7 @@ --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#04 (0.00s) --- 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) @@ -13129,7 +13166,7 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#04 (0.00s) @@ -13158,44 +13195,44 @@ --- 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.01s) + --- 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/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.01s) + --- 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) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#04 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#04 (0.00s) --- 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.01s) + --- 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.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/TwoWay#04 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#04 (0.00s) --- 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.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.01s) + --- 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.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#04 (0.00s) @@ -13213,7 +13250,7 @@ --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#05 (0.01s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#05 (0.00s) @@ -13231,7 +13268,7 @@ --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#05 (0.00s) @@ -13239,7 +13276,7 @@ --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#05 (0.00s) --- 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.01s) + --- 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) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#05 (0.00s) @@ -13247,67 +13284,67 @@ --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#05 (0.00s) --- 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.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#05 (0.00s) --- 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.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#05 (0.02s) --- 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.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_deletion_conflict/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#05 (0.01s) + --- 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) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#05 (0.02s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#05 (0.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_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_with_deletion_conflict/ThreeWay#11 (0.01s) --- 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/ThreeWay#05 (0.02s) --- 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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/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/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#05 (0.02s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#05 (0.01s) + --- 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.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) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#05 (0.01s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#05 (0.01s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#05 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#05 (0.00s) --- 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/TwoWay#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/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#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) @@ -13317,9 +13354,9 @@ --- 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.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_2/ThreeWay#05 (0.02s) --- 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) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#05 (0.01s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#05 (0.00s) @@ -13329,8 +13366,8 @@ --- 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_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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#05 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#05 (0.00s) @@ -13343,7 +13380,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#05 (0.00s) --- 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) @@ -13351,7 +13388,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#05 (0.00s) --- 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.01s) + --- 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.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) @@ -13363,7 +13400,7 @@ --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#05 (0.00s) @@ -13375,22 +13412,22 @@ --- 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/ThreeWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#05 (0.01s) --- 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) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#05 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#05 (0.00s) --- 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.01s) + --- 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.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) @@ -13405,24 +13442,24 @@ --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#06 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#06 (0.00s) --- 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/TwoWay#13 (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) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#06 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#06 (0.00s) --- 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.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#06 (0.01s) + --- 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.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#06 (0.00s) @@ -13435,54 +13472,54 @@ --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#06 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#06 (0.00s) --- 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) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#06 (0.01s) --- 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_value_conflict/ThreeWay#06 (0.02s) --- 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.00s) --- 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.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#06 (0.03s) + --- 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) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#13 (0.04s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#06 (0.02s) --- 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.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/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.03s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#06 (0.01s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#06 (0.02s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#06 (0.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#06 (0.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#06 (0.00s) --- 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/TwoWay#06 (0.01s) --- 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/ThreeWay#06 (0.01s) @@ -13490,29 +13527,29 @@ --- 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.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/TwoWay#06 (0.02s) --- 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.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/TwoWay#06 (0.02s) --- 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) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#06 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#06 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#06 (0.01s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#06 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#06 (0.00s) @@ -13524,28 +13561,28 @@ --- 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) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#06 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#06 (0.02s) - --- 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_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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#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.03s) + --- 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_replaces_non-merging_list/ThreeWay#06 (0.02s) --- 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.02s) --- 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) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#06 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#06 (0.00s) @@ -13555,24 +13592,24 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#06 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#06 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#06 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#06 (0.01s) --- 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.01s) + --- 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.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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#06 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#06 (0.00s) @@ -13581,135 +13618,135 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#06 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#06 (0.01s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#07 (0.01s) - --- 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/TwoWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#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.02s) + --- 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.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.02s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#07 (0.02s) + --- 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) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#07 (0.02s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#07 (0.03s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#07 (0.02s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#07 (0.00s) --- 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.03s) + --- 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.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.03s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#07 (0.01s) + --- 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) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#07 (0.01s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#07 (0.03s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#07 (0.02s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#07 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#07 (0.02s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#07 (0.01s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#07 (0.03s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#07 (0.01s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#07 (0.00s) --- 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.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#07 (0.01s) - --- 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/ThreeWay#14 (0.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#07 (0.03s) + --- 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.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) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#15 (0.01s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#07 (0.02s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#07 (0.00s) --- 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.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#07 (0.02s) --- 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) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#07 (0.01s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#07 (0.00s) --- 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) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#07 (0.01s) - --- 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/delete_an_item_in_a_list_and_preserve_order/ThreeWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#07 (0.02s) + --- PASS: TestStrategicMergePatch/change_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/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.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#07 (0.01s) + --- 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_an_item_in_a_int_list_and_preserve_order/ThreeWay#07 (0.01s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#07 (0.00s) --- 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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/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/ThreeWay#07 (0.01s) --- 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) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#07 (0.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#07 (0.03s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#07 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#07 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#07 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#07 (0.00s) @@ -13717,123 +13754,123 @@ --- 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.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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#07 (0.01s) + --- 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/ThreeWay#07 (0.01s) --- 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.01s) + --- 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/TwoWay#07 (0.01s) --- 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.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) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#07 (0.00s) --- 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/TwoWay#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) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_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/ThreeWay#07 (0.01s) --- 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.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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_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/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.01s) + --- 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_map_deletes_an_item_in_nested_merging_list/ThreeWay#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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#07 (0.01s) + --- 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) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#07 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#07 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#07 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#07 (0.00s) --- 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.03s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#07 (0.01s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#08 (0.00s) --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_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.01s) --- 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/ThreeWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#08 (0.02s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#08 (0.01s) --- 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.02s) + --- 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) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#17 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#08 (0.04s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#08 (0.01s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#08 (0.01s) --- 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.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/ThreeWay#08 (0.01s) --- 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.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#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.01s) --- 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_with_conflict/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#08 (0.01s) + --- 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) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#08 (0.03s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#08 (0.00s) + --- 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.01s) --- 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.01s) - --- 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_deletion_conflict/TwoWay#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/ThreeWay#08 (0.03s) + --- 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.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/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#17 (0.01s) + --- 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) @@ -13851,22 +13888,22 @@ --- 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.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#08 (0.01s) + --- 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) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#08 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#08 (0.02s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#08 (0.00s) --- 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.02s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#08 (0.01s) --- 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.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#08 (0.01s) + --- 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.01s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#08 (0.00s) @@ -13878,62 +13915,62 @@ --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#08 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#08 (0.00s) --- 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.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.02s) + --- 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) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#08 (0.01s) --- 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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#08 (0.02s) + --- 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) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#08 (0.02s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#08 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#08 (0.00s) --- 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.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/TwoWay#08 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#08 (0.01s) --- 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.00s) @@ -13943,22 +13980,22 @@ --- 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.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#08 (0.01s) --- 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.01s) + --- 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) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#08 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#08 (0.00s) --- 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.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/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/TwoWay#08 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#08 (0.00s) --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#08 (0.01s) + --- 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.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) @@ -13969,41 +14006,41 @@ --- 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/ThreeWay#09 (0.01s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#09 (0.00s) --- 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) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#19 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#09 (0.01s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#09 (0.02s) --- 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.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#09 (0.02s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#09 (0.01s) --- 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.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/TwoWay#09 (0.01s) --- 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) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#09 (0.00s) --- 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.02s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#09 (0.01s) --- 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.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#09 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#09 (0.01s) + --- 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.02s) --- 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) @@ -14011,77 +14048,77 @@ --- 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.01s) - --- 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_value_conflict/ThreeWay#09 (0.02s) --- 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/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#09 (0.01s) --- 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_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.01s) --- 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_map_to_merging_list_by_pointer_with_conflict/ThreeWay#09 (0.01s) --- 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/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.02s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#09 (0.00s) --- 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.01s) + --- 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) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#09 (0.03s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#09 (0.00s) - --- 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.02s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#09 (0.01s) + --- 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.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.02s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#09 (0.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#09 (0.02s) --- 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) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#09 (0.04s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#09 (0.00s) - --- 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/TwoWay#09 (0.01s) --- 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.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#09 (0.02s) + --- 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) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#09 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#09 (0.02s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#09 (0.02s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#09 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#09 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#09 (0.00s) @@ -14095,133 +14132,133 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#09 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#09 (0.00s) --- 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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#09 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#09 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#09 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#09 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#09 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#09 (0.00s) --- 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.02s) + --- 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.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/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/TwoWay#09 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#09 (0.01s) - --- 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_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.01s) --- 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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#09 (0.03s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_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.01s) --- 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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#09 (0.03s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/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.01s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList]) (0.07s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/nil_original/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/nil_original/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/nil_patch/TwoWay (0.02s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/nil_patch/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/add_field_to_map/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/add_field_to_map/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/add_field_to_map_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/add_field_to_map_with_conflict/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/add_field_and_delete_field_from_map/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/add_field_and_delete_field_from_map/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/add_field_and_delete_field_from_map_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/add_field_and_delete_field_from_map_with_conflict/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_field_from_nested_map/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_field_from_nested_map/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_field_from_nested_map_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_field_from_nested_map_with_conflict/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_all_fields_from_map/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_all_fields_from_map/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_all_fields_from_map_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_all_fields_from_map_with_conflict/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/add_field_and_delete_all_fields_from_map/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/add_field_and_delete_all_fields_from_map/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/add_field_and_delete_all_fields_from_map_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/add_field_and_delete_all_fields_from_map_with_conflict/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/replace_list_of_scalars/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/replace_list_of_scalars/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/replace_list_of_scalars_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/replace_list_of_scalars_with_conflict/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_all_maps_from_merging_list/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_all_maps_from_merging_list/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_all_maps_from_merging_list_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_all_maps_from_merging_list_with_conflict/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_all_maps_from_empty_merging_list/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/delete_all_maps_from_empty_merging_list/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/merge_empty_merging_lists/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/merge_empty_merging_lists/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/defined_null_values_should_propagate_removing_original_fields/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/defined_null_values_should_propagate_removing_original_fields/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/nil_patch_with_retainKeys_map/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/nil_patch_with_retainKeys_map/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/retainKeys_map_with_no_change_should_not_be_present/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([value_nonMergingList_mergingIntList_nonMergingIntList_simpleMap_replacingItem_retainKeysMap_name_other_mergingList_mergeItemPtr_retainKeysMergingList])/retainKeys_map_with_no_change_should_not_be_present/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap]) (0.04s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/nil_original/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/nil_original/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/nil_patch/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/nil_patch/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/add_field_to_map/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/add_field_to_map/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/add_field_to_map_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/add_field_to_map_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/add_field_and_delete_field_from_map/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/add_field_and_delete_field_from_map/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/add_field_and_delete_field_from_map_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/add_field_and_delete_field_from_map_with_conflict/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_field_from_nested_map/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_field_from_nested_map/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_field_from_nested_map_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_field_from_nested_map_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_all_fields_from_map/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_all_fields_from_map/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_all_fields_from_map_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_all_fields_from_map_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/add_field_and_delete_all_fields_from_map/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/add_field_and_delete_all_fields_from_map/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/add_field_and_delete_all_fields_from_map_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/add_field_and_delete_all_fields_from_map_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/replace_list_of_scalars/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/replace_list_of_scalars/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/replace_list_of_scalars_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/replace_list_of_scalars_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_all_maps_from_merging_list/TwoWay (0.01s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_all_maps_from_merging_list/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_all_maps_from_merging_list_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_all_maps_from_merging_list_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_all_maps_from_empty_merging_list/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/delete_all_maps_from_empty_merging_list/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/merge_empty_merging_lists/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/merge_empty_merging_lists/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/defined_null_values_should_propagate_removing_original_fields/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/defined_null_values_should_propagate_removing_original_fields/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/nil_patch_with_retainKeys_map/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/nil_patch_with_retainKeys_map/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/retainKeys_map_with_no_change_should_not_be_present/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([name_value_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMergingList_other_mergingList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap])/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.00s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#10 (0.01s) --- 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.01s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#10 (0.00s) + --- 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.02s) + --- 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.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.02s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/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/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.02s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/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.01s) --- 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.01s) @@ -14232,16 +14269,16 @@ --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#10 (0.00s) --- 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.02s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#10 (0.00s) + --- 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.01s) --- 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.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/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/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.01s) @@ -14249,23 +14286,23 @@ --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#10 (0.00s) --- 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.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#10 (0.04s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#10 (0.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#20 (0.02s) + --- 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.04s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#21 (0.01s) --- 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) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#10 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#10 (0.03s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#10 (0.01s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#10 (0.00s) @@ -14276,21 +14313,21 @@ --- 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.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#10 (0.02s) + --- 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/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.03s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#10 (0.00s) + --- 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.01s) --- 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) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#10 (0.02s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#10 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#10 (0.02s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#10 (0.01s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#10 (0.00s) @@ -14298,52 +14335,52 @@ --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#10 (0.02s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#10 (0.00s) --- 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.02s) - --- 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_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_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.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#10 (0.01s) --- 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.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#10 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#10 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#10 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#10 (0.00s) - --- 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.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#10 (0.03s) + --- 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.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/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.02s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#10 (0.00s) --- 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.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#10 (0.02s) --- 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.02s) + --- 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.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#10 (0.00s) @@ -14354,7 +14391,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#10 (0.00s) --- 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.02s) + --- 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.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#10 (0.00s) @@ -14366,11 +14403,11 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#10 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#10 (0.01s) - --- 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_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.01s) --- 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.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#10 (0.00s) @@ -14380,7 +14417,7 @@ --- 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/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#10 (0.01s) --- 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) @@ -14388,69 +14425,69 @@ --- 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) - --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#11 (0.01s) --- 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/TwoWay#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) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#11 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#11 (0.02s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#11 (0.04s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#11 (0.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#11 (0.01s) + --- 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) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#11 (0.00s) --- 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_missing_field_from_map_in_merging_list/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#11 (0.01s) + --- 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.01s) + --- 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.00s) --- 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.02s) + --- 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.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#11 (0.01s) + --- 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.02s) + --- 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.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.01s) + --- 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.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.02s) + --- 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.01s) + --- 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/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#11 (0.00s) --- 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) @@ -14459,7 +14496,7 @@ --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#11 (0.02s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#11 (0.00s) @@ -14468,41 +14505,41 @@ --- 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.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.03s) + --- 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) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#11 (0.03s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#11 (0.03s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#11 (0.03s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#11 (0.00s) --- 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.03s) + --- 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.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.04s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#11 (0.00s) --- 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.02s) + --- 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.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) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#11 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#11 (0.00s) --- 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) @@ -14519,36 +14556,36 @@ --- 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_with_conflict/TwoWay#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) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#11 (0.03s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#11 (0.00s) --- 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.03s) + --- 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.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#11 (0.00s) --- 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.02s) + --- 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.03s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#11 (0.00s) --- 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.01s) + --- 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/ThreeWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#11 (0.01s) + --- 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) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#11 (0.00s) --- 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) @@ -14556,23 +14593,23 @@ --- 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.00s) --- 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.03s) + --- 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.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.02s) + --- 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) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#12 (0.00s) @@ -14581,89 +14618,89 @@ --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#24 (0.03s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#12 (0.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#12 (0.02s) + --- 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.03s) + --- 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.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.02s) + --- 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_with_conflict/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#12 (0.02s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#12 (0.03s) + --- 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) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#12 (0.03s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#12 (0.02s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#12 (0.00s) --- 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.03s) + --- 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/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#12 (0.01s) --- 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.03s) + --- 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.02s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#12 (0.01s) --- 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.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#12 (0.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#12 (0.01s) --- 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.03s) + --- 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.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.03s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#25 (0.01s) + --- 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.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.02s) + --- 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.02s) - --- 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.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.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#12 (0.02s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#12 (0.02s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#12 (0.02s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#12 (0.01s) --- 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.02s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#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.02s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#12 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#12 (0.00s) @@ -14672,20 +14709,20 @@ --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#12 (0.00s) --- 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/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#12 (0.01s) --- 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.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#12 (0.01s) + --- 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) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#12 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#12 (0.00s) @@ -14693,45 +14730,45 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#12 (0.00s) --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#12 (0.00s) --- 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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#12 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#12 (0.01s) --- 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) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#12 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#12 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#12 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#12 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#12 (0.00s) --- 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_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#12 (0.02s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#12 (0.05s) + --- 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.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.03s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#12 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#12 (0.04s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#12 (0.00s) + --- 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.01s) --- 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/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) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#12 (0.04s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#12 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#12 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#12 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#12 (0.00s) @@ -14740,52 +14777,52 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#12 (0.00s) --- 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.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#12 (0.01s) + --- 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_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.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#12 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#12 (0.02s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#12 (0.00s) --- 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/ThreeWay#12 (0.01s) --- 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.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#12 (0.00s) --- 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) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#13 (0.00s) --- 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.02s) + --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#13 (0.00s) --- 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.05s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#13 (0.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#26 (0.01s) + --- 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.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.03s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#13 (0.01s) + --- 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) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#13 (0.01s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#13 (0.02s) + --- 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.00s) @@ -14794,124 +14831,124 @@ --- 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/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.02s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#13 (0.01s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#13 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#13 (0.02s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#13 (0.01s) --- 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.02s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#13 (0.02s) + --- 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.02s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#26 (0.02s) - --- 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.02s) - --- 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_value_conflict/ThreeWay#13 (0.01s) + --- 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/TwoWay#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.03s) + --- 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) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#13 (0.02s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#13 (0.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#13 (0.02s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#13 (0.03s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#13 (0.02s) + --- 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) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#13 (0.03s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#13 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#13 (0.00s) --- 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.01s) --- 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/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.02s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#13 (0.01s) --- 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) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#13 (0.02s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#13 (0.02s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#13 (0.00s) --- 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.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/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_adds_a_field/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#13 (0.01s) + --- 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) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#13 (0.01s) --- 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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#13 (0.02s) + --- 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) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#13 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#13 (0.00s) --- 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.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#13 (0.01s) + --- 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_replaces_non-merging_list/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#13 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#13 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#13 (0.00s) --- 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_deletes_nested_non-merging_list/ThreeWay#13 (0.01s) --- 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.02s) + --- 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) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#13 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#13 (0.00s) @@ -14920,159 +14957,159 @@ --- 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.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#13 (0.00s) + --- 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.01s) --- 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) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#13 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#13 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#13 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#13 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#13 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#13 (0.01s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#13 (0.00s) + --- 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.01s) --- 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.02s) - --- 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_and_reorder_in_one_list,_reorder_in_another/ThreeWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#14 (0.01s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#14 (0.00s) --- 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) - --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#14 (0.01s) --- 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.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#14 (0.00s) --- 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.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#28 (0.01s) + --- 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) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#14 (0.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#14 (0.01s) --- 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.00s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#14 (0.02s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/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.01s) --- 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.02s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#14 (0.02s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#14 (0.01s) --- 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.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) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#14 (0.01s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#14 (0.02s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#14 (0.00s) --- 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_field_from_map_in_merging_list_with_conflict/ThreeWay#14 (0.02s) --- 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_with_conflict/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#14 (0.02s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#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.02s) --- 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_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/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#14 (0.01s) --- 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.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_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_with_deletion_conflict/TwoWay#29 (0.02s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#14 (0.02s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#14 (0.00s) --- 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_map_to_merging_list_by_pointer_with_conflict/ThreeWay#14 (0.01s) --- 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.02s) - --- 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.02s) + --- 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.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) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#14 (0.01s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#14 (0.02s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#14 (0.02s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#14 (0.01s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#14 (0.02s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#14 (0.02s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#14 (0.00s) --- 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.05s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#14 (0.01s) --- 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.04s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/add_multiple_items_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) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#14 (0.01s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#14 (0.02s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#14 (0.00s) --- 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.00s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#14 (0.01s) --- 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.03s) + --- 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) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#14 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#14 (0.03s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#14 (0.00s) @@ -15087,39 +15124,39 @@ --- 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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#14 (0.03s) + --- 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_deletes_nested_non-merging_list/TwoWay#14 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#14 (0.00s) + --- 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.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#14 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#14 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#14 (0.01s) --- 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.02s) + --- 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) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#14 (0.00s) --- 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.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#14 (0.01s) --- 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/ThreeWay#14 (0.00s) + --- 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.01s) --- 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) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#14 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#14 (0.03s) @@ -15128,32 +15165,32 @@ --- 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.02s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#15 (0.01s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#15 (0.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#30 (0.02s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#15 (0.01s) + --- 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/TwoWay#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) + --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#15 (0.01s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#15 (0.00s) @@ -15164,45 +15201,45 @@ --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#15 (0.00s) --- 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/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.01s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#15 (0.02s) --- 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.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.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#15 (0.01s) + --- 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.01s) + --- 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.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/TwoWay#15 (0.01s) --- 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_value_conflict/ThreeWay#15 (0.01s) --- 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/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#15 (0.00s) + --- 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.01s) --- 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.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#30 (0.01s) + --- 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_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.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/ThreeWay#15 (0.01s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#15 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#15 (0.00s) @@ -15210,23 +15247,23 @@ --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#15 (0.00s) --- 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/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#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.01s) + --- 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.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#15 (0.01s) + --- 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) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#15 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#15 (0.02s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#15 (0.00s) @@ -15234,7 +15271,7 @@ --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#15 (0.00s) --- 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/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#15 (0.02s) --- 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.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#15 (0.00s) @@ -15244,73 +15281,73 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#15 (0.00s) --- 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.01s) + --- 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.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_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.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#15 (0.01s) --- 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/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) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#15 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#15 (0.00s) --- 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.01s) + --- 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.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.01s) + --- 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.02s) + --- 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.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.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#15 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#15 (0.00s) --- 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/ThreeWay#15 (0.01s) --- 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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#15 (0.01s) + --- 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) @@ -15320,7 +15357,7 @@ --- 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.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#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) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#16 (0.00s) @@ -15328,7 +15365,7 @@ --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#16 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#16 (0.01s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#16 (0.00s) @@ -15341,17 +15378,17 @@ --- 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.00s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#16 (0.01s) + --- 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) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#16 (0.00s) @@ -15372,25 +15409,25 @@ --- 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.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#16 (0.00s) --- 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.01s) + --- 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.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#33 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#33 (0.01s) --- 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) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#16 (0.02s) + --- 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.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#16 (0.02s) + --- 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) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#16 (0.00s) @@ -15400,9 +15437,9 @@ --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#16 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#16 (0.01s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#16 (0.00s) @@ -15410,7 +15447,7 @@ --- 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.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#16 (0.01s) + --- 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) @@ -15427,7 +15464,7 @@ --- 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) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#16 (0.00s) @@ -15440,7 +15477,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#16 (0.00s) @@ -15454,39 +15491,39 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#16 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#16 (0.00s) --- 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/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.01s) + --- 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.01s) + --- 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.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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#16 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#16 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#16 (0.02s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#16 (0.00s) @@ -15504,10 +15541,10 @@ --- 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) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#17 (0.00s) @@ -15518,15 +15555,15 @@ --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#17 (0.01s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#17 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#34 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#34 (0.02s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#34 (0.00s) --- 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.01s) + --- 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.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#17 (0.01s) --- 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.00s) @@ -15534,9 +15571,9 @@ --- 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.01s) --- 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/ThreeWay#17 (0.01s) --- 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) @@ -15544,42 +15581,42 @@ --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#17 (0.01s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#17 (0.00s) --- 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/TwoWay#17 (0.02s) --- 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.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/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#17 (0.02s) --- 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/TwoWay#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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#17 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#17 (0.01s) - --- 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/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.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#34 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#34 (0.01s) --- 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.02s) --- 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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/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.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.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#17 (0.00s) @@ -15587,54 +15624,54 @@ --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#17 (0.01s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#17 (0.00s) --- 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/change_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/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.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#17 (0.01s) + --- 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.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_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) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#17 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#17 (0.01s) --- 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.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) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#17 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#17 (0.00s) @@ -15642,21 +15679,21 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#17 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#17 (0.00s) --- 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/TwoWay#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.01s) + --- 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) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#17 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#17 (0.00s) --- 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_deletes_nested_non-merging_list/ThreeWay#17 (0.01s) --- 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_nested_merging_int_list_with_no_change/TwoWay#17 (0.00s) @@ -15667,38 +15704,38 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#17 (0.01s) --- 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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#17 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_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.02s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#17 (0.00s) - --- 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/TwoWay#17 (0.01s) --- 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_with_conflict/TwoWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#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.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#17 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#17 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#17 (0.01s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#17 (0.01s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#18 (0.01s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#18 (0.00s) @@ -15708,7 +15745,7 @@ --- 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/merge_lists_of_maps_with_conflict/ThreeWay#18 (0.01s) --- 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.00s) @@ -15717,57 +15754,57 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#18 (0.01s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#18 (0.00s) --- 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/ThreeWay#18 (0.01s) --- 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/delete_map_from_merging_list/TwoWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#18 (0.01s) --- 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.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#18 (0.01s) --- 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/ThreeWay#18 (0.01s) --- 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.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/ThreeWay#18 (0.01s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#18 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#18 (0.01s) --- 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.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#18 (0.01s) --- 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/TwoWay#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.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/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_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#37 (0.01s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#18 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#18 (0.01s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#18 (0.00s) @@ -15776,21 +15813,21 @@ --- 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.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#18 (0.01s) --- 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) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#18 (0.00s) - --- 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/TwoWay#18 (0.01s) --- 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/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/ThreeWay#18 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#18 (0.00s) --- 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_2/ThreeWay#18 (0.01s) --- 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.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#18 (0.00s) @@ -15810,7 +15847,7 @@ --- 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) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#18 (0.01s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#18 (0.00s) @@ -15828,7 +15865,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#18 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#18 (0.00s) @@ -15836,7 +15873,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#18 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#18 (0.00s) @@ -15864,26 +15901,26 @@ --- 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.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_nested_merging_list/ThreeWay#18 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#18 (0.00s) --- 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.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#18 (0.01s) --- 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.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#18 (0.01s) --- 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) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#18 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#18 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#18 (0.01s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#19 (0.00s) @@ -15892,11 +15929,11 @@ --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#19 (0.02s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#19 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#38 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#38 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#39 (0.00s) @@ -15904,57 +15941,57 @@ --- 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.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_duplicate_field_to_map_in_merging_list/ThreeWay#19 (0.01s) --- 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.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#19 (0.01s) --- 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) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#19 (0.01s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#19 (0.00s) --- 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/TwoWay#19 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#19 (0.00s) --- 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/ThreeWay#19 (0.01s) --- 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.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#19 (0.01s) --- 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.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#19 (0.00s) --- 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/TwoWay#19 (0.01s) --- 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) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_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/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/TwoWay#19 (0.01s) --- 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_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.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#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) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#19 (0.01s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#19 (0.00s) --- 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/ThreeWay#19 (0.01s) --- 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.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#19 (0.01s) --- 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) @@ -15972,7 +16009,7 @@ --- 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/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) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#19 (0.03s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#19 (0.00s) @@ -15994,7 +16031,7 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#19 (0.00s) --- 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_2/ThreeWay#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) @@ -16016,7 +16053,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#19 (0.00s) --- 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_nested_map_with_no_change/ThreeWay#19 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#19 (0.00s) @@ -16030,32 +16067,32 @@ --- 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.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#19 (0.01s) --- 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) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#19 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#19 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#19 (0.00s) --- 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.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#19 (0.02s) --- 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_changes_an_item_in_nested_merging_list/TwoWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#19 (0.01s) --- 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) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#19 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#19 (0.00s) @@ -16073,7 +16110,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.02s) + --- PASS: TestStrategicMergePatch/Struct (0.04s) --- PASS: TestStrategicMergePatch/Struct/nil_original/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/nil_original/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/nil_patch/TwoWay (0.00s) @@ -16105,7 +16142,7 @@ --- PASS: TestStrategicMergePatch/Struct/delete_all_maps_from_merging_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/delete_all_maps_from_merging_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/delete_all_maps_from_merging_list_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Struct/delete_all_maps_from_merging_list_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Struct/delete_all_maps_from_merging_list_with_conflict/ThreeWay (0.01s) --- PASS: TestStrategicMergePatch/Struct/delete_all_maps_from_empty_merging_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/delete_all_maps_from_empty_merging_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/merge_empty_merging_lists/TwoWay (0.00s) @@ -16122,14 +16159,14 @@ --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#20 (0.01s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#20 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#40 (0.00s) --- 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) @@ -16147,9 +16184,9 @@ --- 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.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#20 (0.00s) @@ -16160,61 +16197,61 @@ --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#20 (0.00s) --- 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/TwoWay#20 (0.02s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#20 (0.00s) --- 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/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.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#20 (0.02s) --- 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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#20 (0.01s) + --- 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.01s) --- 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/ThreeWay#20 (0.01s) - --- 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.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.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#40 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#41 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#41 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#20 (0.01s) --- 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.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#20 (0.01s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#20 (0.01s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#20 (0.02s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#20 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/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.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/ThreeWay#20 (0.01s) --- 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/add_an_item_in_a_int_list_and_preserve_order/TwoWay#20 (0.01s) + --- 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.02s) + --- 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) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#20 (0.00s) @@ -16225,13 +16262,13 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#20 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#20 (0.01s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#20 (0.00s) --- 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) @@ -16239,7 +16276,7 @@ --- 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/ThreeWay#20 (0.01s) --- 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.00s) @@ -16259,40 +16296,40 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#20 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#20 (0.01s) --- 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.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/TwoWay#20 (0.01s) --- 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.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/TwoWay#20 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#20 (0.01s) --- 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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#20 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#20 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#20 (0.00s) @@ -16300,36 +16337,36 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#20 (0.00s) --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_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_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) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#21 (0.01s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#21 (0.01s) + --- 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.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) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#21 (0.01s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#42 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#42 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#42 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#43 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#43 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#43 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#21 (0.02s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#21 (0.00s) - --- 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/TwoWay#21 (0.01s) --- 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.02s) --- 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) @@ -16337,11 +16374,11 @@ --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#21 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#21 (0.01s) @@ -16349,76 +16386,76 @@ --- 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.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#21 (0.02s) --- 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.01s) + --- 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/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#21 (0.01s) --- 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.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.01s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#21 (0.00s) - --- 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.01s) - --- 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/TwoWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#21 (0.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#42 (0.02s) + --- 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_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#43 (0.01s) --- 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.00s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#21 (0.01s) --- 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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#21 (0.02s) --- 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.01s) + --- 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.02s) --- 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) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#21 (0.01s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#21 (0.00s) + --- 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.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.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#21 (0.01s) --- 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) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#21 (0.01s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#21 (0.01s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#21 (0.01s) --- 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/ThreeWay#21 (0.01s) --- 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/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) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#21 (0.00s) --- 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/TwoWay#21 (0.01s) --- 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.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#21 (0.00s) @@ -16455,11 +16492,11 @@ --- 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) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#21 (0.00s) --- 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) @@ -16469,10 +16506,10 @@ --- 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) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#21 (0.00s) @@ -16492,32 +16529,32 @@ --- 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.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/TwoWay#21 (0.01s) --- 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/nested_patch_merge_with_empty_list/ThreeWay#22 (0.01s) --- 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.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) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#22 (0.01s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#44 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#44 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#44 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#45 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#45 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#45 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#22 (0.01s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#22 (0.01s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#22 (0.00s) --- 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) @@ -16529,7 +16566,7 @@ --- 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.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#22 (0.02s) --- 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) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#22 (0.00s) @@ -16539,11 +16576,11 @@ --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#22 (0.00s) --- 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/ThreeWay#22 (0.01s) --- 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/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/ThreeWay#22 (0.01s) --- 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) @@ -16551,71 +16588,71 @@ --- 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) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#22 (0.02s) --- 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/ThreeWay#44 (0.02s) --- 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_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/TwoWay#22 (0.03s) + --- 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/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#22 (0.01s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#22 (0.02s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#22 (0.01s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#22 (0.00s) --- 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/change_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/TwoWay#22 (0.00s) --- 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/TwoWay#22 (0.01s) --- 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) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#22 (0.01s) --- 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_an_item_in_a_int_list_and_preserve_order/ThreeWay#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) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#22 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#22 (0.01s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#22 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#22 (0.02s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#22 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#22 (0.00s) @@ -16623,55 +16660,55 @@ --- 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.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#22 (0.01s) --- 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) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#22 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#22 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#22 (0.00s) --- 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/ThreeWay#22 (0.02s) --- 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_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) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#22 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#22 (0.01s) --- 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.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_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_adds_an_item_in_nested_merging_list/ThreeWay#22 (0.01s) --- 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) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#22 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#22 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#22 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#22 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#22 (0.00s) @@ -16681,7 +16718,7 @@ --- 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/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#22 (0.01s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#23 (0.00s) @@ -16697,16 +16734,16 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#46 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#46 (0.00s) --- 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/ThreeWay#47 (0.01s) --- 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_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_duplicate_field_to_map_in_merging_list/ThreeWay#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/replace_map_field_value_in_merging_list/TwoWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#23 (0.02s) --- 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) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#23 (0.00s) @@ -16717,8 +16754,8 @@ --- 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/delete_missing_map_from_merging_list_with_conflict/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#23 (0.01s) --- 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.00s) @@ -16727,7 +16764,7 @@ --- 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.01s) + --- 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.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#23 (0.00s) @@ -16741,7 +16778,7 @@ --- 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.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/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_map_to_merging_list_by_pointer/TwoWay#23 (0.00s) @@ -16766,10 +16803,10 @@ --- 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.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.01s) + --- 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/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.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#23 (0.01s) --- 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) @@ -16777,7 +16814,7 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#23 (0.01s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#23 (0.00s) @@ -16816,7 +16853,7 @@ --- 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.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/TwoWay#23 (0.01s) --- 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) @@ -16824,22 +16861,22 @@ --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#23 (0.01s) --- 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.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_delete_nested_non-merging_list_with_conflict/ThreeWay#23 (0.02s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#23 (0.00s) --- 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.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#23 (0.01s) --- 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_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#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) @@ -16881,23 +16918,23 @@ --- 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_with_conflict/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#24 (0.01s) --- 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.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_field_to_map_in_merging_list_with_conflict/ThreeWay#24 (0.03s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#24 (0.00s) --- 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.01s) --- 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) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#24 (0.01s) --- 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) @@ -16905,22 +16942,22 @@ --- 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) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#24 (0.01s) --- 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.00s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#24 (0.01s) --- 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) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#24 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#24 (0.01s) --- 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/TwoWay#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.01s) @@ -16929,23 +16966,23 @@ --- 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_deletion_conflict/TwoWay#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/ThreeWay#48 (0.02s) --- 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.01s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#24 (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_map_to_merging_list_by_pointer/TwoWay#24 (0.01s) --- 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.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/TwoWay#24 (0.01s) --- 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) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#24 (0.01s) --- 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.00s) @@ -16957,11 +16994,11 @@ --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#24 (0.02s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#24 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#24 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#24 (0.00s) @@ -16974,7 +17011,7 @@ --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#24 (0.01s) --- 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.00s) @@ -16992,7 +17029,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#24 (0.00s) --- 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) @@ -17002,50 +17039,50 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#24 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#24 (0.00s) --- 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/TwoWay#24 (0.01s) --- 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/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/TwoWay#24 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#24 (0.01s) --- 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.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) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#24 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#24 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#24 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#24 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#24 (0.00s) --- 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/TwoWay#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/ThreeWay#24 (0.02s) --- 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_adds_a_field/TwoWay#24 (0.00s) @@ -17057,49 +17094,49 @@ --- 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.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/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#24 (0.01s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#25 (0.01s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#25 (0.01s) --- 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.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/TwoWay#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_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#25 (0.01s) --- 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.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#25 (0.01s) --- 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/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#25 (0.01s) --- 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/ThreeWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#25 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#25 (0.01s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#25 (0.00s) --- 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/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#25 (0.01s) --- 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.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#25 (0.01s) --- 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) @@ -17111,20 +17148,20 @@ --- 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.01s) --- 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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/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.01s) --- 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.00s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#25 (0.01s) --- 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) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#25 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#25 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#25 (0.00s) @@ -17136,22 +17173,22 @@ --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#25 (0.00s) --- 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/TwoWay#25 (0.01s) --- 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.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/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.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/TwoWay#25 (0.01s) --- 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) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#25 (0.01s) --- 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.01s) - --- 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_2/TwoWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#25 (0.01s) --- 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.01s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#25 (0.00s) @@ -17161,7 +17198,7 @@ --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#25 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#25 (0.00s) @@ -17175,13 +17212,13 @@ --- 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/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/ThreeWay#25 (0.01s) --- 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.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_adds_a_field_and_clear_a_field/ThreeWay#25 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#25 (0.00s) @@ -17193,34 +17230,34 @@ --- 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) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#25 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#25 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#25 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#25 (0.00s) --- 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.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/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) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#25 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#25 (0.00s) --- 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.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#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) @@ -17231,31 +17268,31 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#25 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#25 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#25 (0.01s) --- 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/TwoWay#25 (0.01s) --- 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/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#25 (0.01s) --- 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/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.00s) - --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#26 (0.01s) --- 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) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#26 (0.01s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#52 (0.00s) @@ -17265,7 +17302,7 @@ --- 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.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_duplicate_field_to_map_in_merging_list/ThreeWay#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) @@ -17277,43 +17314,43 @@ --- 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) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#26 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#26 (0.01s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#26 (0.01s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#26 (0.01s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#26 (0.01s) --- 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.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/TwoWay#26 (0.02s) --- 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.02s) --- 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/TwoWay#26 (0.02s) --- 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.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/ThreeWay#52 (0.02s) --- 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_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#53 (0.01s) --- 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.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/ThreeWay#26 (0.02s) --- 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/merge_lists_of_scalars/TwoWay#26 (0.00s) @@ -17321,11 +17358,11 @@ --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#26 (0.02s) --- 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.00s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#26 (0.02s) --- 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) @@ -17336,7 +17373,7 @@ --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#26 (0.00s) --- 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/TwoWay#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) @@ -17345,7 +17382,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) @@ -17353,14 +17390,14 @@ --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#26 (0.01s) --- 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.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) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#26 (0.01s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#26 (0.00s) @@ -17368,45 +17405,45 @@ --- 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) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#26 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#26 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#26 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#26 (0.00s) + --- 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.02s) --- 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_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_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#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.01s) + --- 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_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#26 (0.01s) --- 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.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) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#26 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#26 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#26 (0.00s) --- 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/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/TwoWay#26 (0.01s) --- 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) @@ -17419,7 +17456,7 @@ --- 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_clears_a_field_with_conflict/ThreeWay#26 (0.01s) --- 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) @@ -17459,7 +17496,7 @@ --- 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/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/ThreeWay#27 (0.01s) --- 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.00s) @@ -17473,7 +17510,7 @@ --- 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.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.01s) + --- 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) @@ -17481,7 +17518,7 @@ --- 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) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#27 (0.00s) --- 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) @@ -17490,10 +17527,10 @@ --- 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) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#27 (0.02s) --- 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/ThreeWay#54 (0.01s) --- 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.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#27 (0.00s) @@ -17501,35 +17538,35 @@ --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#27 (0.02s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#27 (0.00s) --- 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.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_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.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/delete_an_item_in_a_list_and_preserve_order/ThreeWay#27 (0.01s) --- 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/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) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#27 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#27 (0.01s) --- 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_2/ThreeWay#27 (0.01s) --- 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.02s) + --- 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) @@ -17546,8 +17583,8 @@ --- 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.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.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#27 (0.01s) + --- 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) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#27 (0.00s) @@ -17562,7 +17599,7 @@ --- 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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#27 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#27 (0.00s) @@ -17666,43 +17703,43 @@ --- 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.01s) + --- 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_value_conflict/ThreeWay#28 (0.01s) --- 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/ThreeWay#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.01s) + --- 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.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#28 (0.00s) @@ -17716,27 +17753,27 @@ --- 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_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) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#28 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#28 (0.01s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#28 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#28 (0.00s) --- 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/TwoWay#28 (0.02s) --- 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) @@ -17747,7 +17784,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#28 (0.01s) --- 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) @@ -17763,11 +17800,11 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#28 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#28 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#28 (0.00s) --- 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) @@ -17776,24 +17813,24 @@ --- 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/TwoWay#28 (0.01s) --- 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_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) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#28 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#28 (0.00s) --- 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_changes_an_item_in_nested_merging_list/ThreeWay#28 (0.01s) --- 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_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/ThreeWay#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.00s) @@ -17808,7 +17845,7 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#28 (0.01s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#29 (0.00s) @@ -17828,7 +17865,7 @@ --- 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.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/TwoWay#29 (0.01s) --- 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/ThreeWay#29 (0.00s) @@ -17853,7 +17890,7 @@ --- 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) @@ -17867,45 +17904,45 @@ --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#29 (0.00s) + --- 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/ThreeWay#58 (0.02s) --- 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_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#59 (0.01s) --- 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) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#29 (0.01s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#29 (0.00s) --- 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.00s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#29 (0.01s) --- 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) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#29 (0.01s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#29 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#29 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#29 (0.01s) --- 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) @@ -17931,35 +17968,35 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#29 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#29 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#29 (0.01s) --- 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.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/ThreeWay#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_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#29 (0.01s) --- 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) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#29 (0.00s) @@ -17973,11 +18010,11 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#29 (0.00s) --- 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/TwoWay#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) @@ -18001,207 +18038,207 @@ === RUN TestNumberConversion --- PASS: TestNumberConversion (0.01s) === RUN TestReplaceWithRawExtension ---- PASS: TestReplaceWithRawExtension (0.02s) +--- PASS: TestReplaceWithRawExtension (0.04s) === 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_mergingList_mergingIntList_simpleMap_retainKeysMap_replacingItem_retainKeysMergingList_value_other_nonMergingList_nonMergingIntList_mergeItemPtr])/TwoWay -=== RUN TestUnknownField/add_empty_slices/Kind([nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value_other_mergingIntList_simpleMap_retainKeysMap_name_mergingList])/ThreeWay +=== RUN TestUnknownField/add_empty_slices/Kind([name_other_simpleMap_replacingItem_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList])/TwoWay +=== RUN TestUnknownField/add_empty_slices/Kind([nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList_name_other_simpleMap_replacingItem])/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_retainKeysMergingList_value_other_nonMergingList_nonMergingIntList_mergeItemPtr_name_mergingList_mergingIntList_simpleMap_retainKeysMap])/TwoWay -=== RUN TestUnknownField/add_only_not_nulls/Kind([name_mergingList_mergingIntList_simpleMap_retainKeysMap_replacingItem_retainKeysMergingList_value_other_nonMergingList_nonMergingIntList_mergeItemPtr])/ThreeWay +=== RUN TestUnknownField/add_only_not_nulls/Kind([mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_replacingItem_name_other_simpleMap])/TwoWay +=== RUN TestUnknownField/add_only_not_nulls/Kind([simpleMap_replacingItem_name_other_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList])/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([replacingItem_retainKeysMergingList_value_other_nonMergingList_nonMergingIntList_mergeItemPtr_name_mergingList_mergingIntList_simpleMap_retainKeysMap])/TwoWay -=== RUN TestUnknownField/added_only/Kind([other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value_mergingList_mergingIntList_simpleMap_retainKeysMap_name])/ThreeWay +=== RUN TestUnknownField/added_only/Kind([name_other_simpleMap_replacingItem_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList])/TwoWay +=== RUN TestUnknownField/added_only/Kind([mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_replacingItem_name_other_simpleMap])/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([nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value_other_nonMergingList_simpleMap_retainKeysMap_name_mergingList_mergingIntList])/TwoWay -=== RUN TestUnknownField/diff/Kind([simpleMap_retainKeysMap_name_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value_other_nonMergingList])/ThreeWay +=== RUN TestUnknownField/diff/Kind([name_other_simpleMap_replacingItem_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList])/TwoWay +=== RUN TestUnknownField/diff/Kind([name_other_simpleMap_replacingItem_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList])/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([simpleMap_retainKeysMap_name_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value_other_nonMergingList])/TwoWay -=== RUN TestUnknownField/discard_if_modified_all_nulls/Kind([retainKeysMergingList_value_other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_name_mergingList_mergingIntList_simpleMap_retainKeysMap])/ThreeWay +=== RUN TestUnknownField/discard_if_modified_all_nulls/Kind([retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_name_other_simpleMap_replacingItem])/TwoWay +=== RUN TestUnknownField/discard_if_modified_all_nulls/Kind([simpleMap_replacingItem_name_other_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList])/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([name_mergingList_mergingIntList_simpleMap_retainKeysMap_replacingItem_retainKeysMergingList_value_other_nonMergingList_nonMergingIntList_mergeItemPtr])/TwoWay -=== RUN TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/Kind([name_mergingList_mergingIntList_simpleMap_retainKeysMap_replacingItem_retainKeysMergingList_value_other_nonMergingList_nonMergingIntList_mergeItemPtr])/ThreeWay +=== RUN TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/Kind([mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_name_other_simpleMap_replacingItem])/TwoWay +=== RUN TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/Kind([retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_name_other_simpleMap_replacingItem])/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([nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value_other_mergingIntList_simpleMap_retainKeysMap_name_mergingList])/TwoWay -=== RUN TestUnknownField/filter_if_slice_is_all_empty/Kind([mergingList_mergingIntList_simpleMap_retainKeysMap_name_other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value])/ThreeWay +=== RUN TestUnknownField/filter_if_slice_is_all_empty/Kind([value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_name_other_simpleMap_replacingItem])/TwoWay +=== RUN TestUnknownField/filter_if_slice_is_all_empty/Kind([name_other_simpleMap_replacingItem_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList])/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([mergingList_mergingIntList_simpleMap_retainKeysMap_name_other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value])/TwoWay -=== RUN TestUnknownField/filter_nulls_from_nested_slices/Kind([mergingList_mergingIntList_simpleMap_retainKeysMap_name_other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value])/ThreeWay +=== RUN TestUnknownField/filter_nulls_from_nested_slices/Kind([name_other_simpleMap_replacingItem_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList])/TwoWay +=== RUN TestUnknownField/filter_nulls_from_nested_slices/Kind([nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList_name_other_simpleMap_replacingItem])/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([name_mergingList_mergingIntList_simpleMap_retainKeysMap_replacingItem_retainKeysMergingList_value_other_nonMergingList_nonMergingIntList_mergeItemPtr])/TwoWay -=== RUN TestUnknownField/nested_null_values_in_original_are_preserved/Kind([mergingList_mergingIntList_simpleMap_retainKeysMap_name_other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value])/ThreeWay +=== RUN TestUnknownField/nested_null_values_in_original_are_preserved/Kind([retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_name_other_simpleMap_replacingItem])/TwoWay +=== RUN TestUnknownField/nested_null_values_in_original_are_preserved/Kind([simpleMap_replacingItem_name_other_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList])/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([other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value_mergingList_mergingIntList_simpleMap_retainKeysMap_name])/TwoWay -=== RUN TestUnknownField/no_diff/Kind([value_other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_mergingList_mergingIntList_simpleMap_retainKeysMap])/ThreeWay +=== RUN TestUnknownField/no_diff/Kind([name_other_simpleMap_replacingItem_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList])/TwoWay +=== RUN TestUnknownField/no_diff/Kind([name_other_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr])/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([value_other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_mergingList_mergingIntList_simpleMap_retainKeysMap])/TwoWay -=== RUN TestUnknownField/no_diff_even_if_modified_null/Kind([mergingList_mergingIntList_simpleMap_retainKeysMap_name_other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value])/ThreeWay +=== RUN TestUnknownField/no_diff_even_if_modified_null/Kind([other_simpleMap_replacingItem_name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value])/TwoWay +=== RUN TestUnknownField/no_diff_even_if_modified_null/Kind([other_simpleMap_replacingItem_name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value])/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([other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value_mergingList_mergingIntList_simpleMap_retainKeysMap_name])/TwoWay -=== RUN TestUnknownField/not_filter_nulls_from_non-associative_slice/Kind([retainKeysMergingList_value_other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_name_mergingList_mergingIntList_simpleMap_retainKeysMap])/ThreeWay +=== RUN TestUnknownField/not_filter_nulls_from_non-associative_slice/Kind([other_simpleMap_replacingItem_name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value])/TwoWay +=== RUN TestUnknownField/not_filter_nulls_from_non-associative_slice/Kind([mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_replacingItem_name_other_simpleMap])/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([retainKeysMap_name_mergingList_mergingIntList_simpleMap_mergeItemPtr_replacingItem_retainKeysMergingList_value_other_nonMergingList_nonMergingIntList])/TwoWay -=== RUN TestUnknownField/null_values_in_original_are_preserved/Kind([simpleMap_retainKeysMap_name_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value_other_nonMergingList])/ThreeWay +=== RUN TestUnknownField/null_values_in_original_are_preserved/Kind([nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_simpleMap_replacingItem_name_other])/TwoWay +=== RUN TestUnknownField/null_values_in_original_are_preserved/Kind([retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_name_other_simpleMap_replacingItem])/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([retainKeysMap_name_mergingList_mergingIntList_simpleMap_mergeItemPtr_replacingItem_retainKeysMergingList_value_other_nonMergingList_nonMergingIntList])/TwoWay -=== RUN TestUnknownField/removed_only/Kind([value_other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_mergingList_mergingIntList_simpleMap_retainKeysMap])/ThreeWay +=== RUN TestUnknownField/removed_only/Kind([value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_name_other_simpleMap_replacingItem])/TwoWay +=== RUN TestUnknownField/removed_only/Kind([mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_name_other_simpleMap_replacingItem])/ThreeWay === RUN TestUnknownField/removed_only/Struct/TwoWay === RUN TestUnknownField/removed_only/Struct/ThreeWay ---- PASS: TestUnknownField (0.02s) +--- PASS: TestUnknownField (0.04s) --- 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_mergingList_mergingIntList_simpleMap_retainKeysMap_replacingItem_retainKeysMergingList_value_other_nonMergingList_nonMergingIntList_mergeItemPtr])/TwoWay (0.00s) - --- PASS: TestUnknownField/add_empty_slices/Kind([nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value_other_mergingIntList_simpleMap_retainKeysMap_name_mergingList])/ThreeWay (0.00s) + --- PASS: TestUnknownField/add_empty_slices/Kind([name_other_simpleMap_replacingItem_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList])/TwoWay (0.00s) + --- PASS: TestUnknownField/add_empty_slices/Kind([nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList_name_other_simpleMap_replacingItem])/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 (0.01s) --- 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_retainKeysMergingList_value_other_nonMergingList_nonMergingIntList_mergeItemPtr_name_mergingList_mergingIntList_simpleMap_retainKeysMap])/TwoWay (0.00s) - --- PASS: TestUnknownField/add_only_not_nulls/Kind([name_mergingList_mergingIntList_simpleMap_retainKeysMap_replacingItem_retainKeysMergingList_value_other_nonMergingList_nonMergingIntList_mergeItemPtr])/ThreeWay (0.00s) + --- PASS: TestUnknownField/add_only_not_nulls/Kind([mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_replacingItem_name_other_simpleMap])/TwoWay (0.00s) + --- PASS: TestUnknownField/add_only_not_nulls/Kind([simpleMap_replacingItem_name_other_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList])/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([replacingItem_retainKeysMergingList_value_other_nonMergingList_nonMergingIntList_mergeItemPtr_name_mergingList_mergingIntList_simpleMap_retainKeysMap])/TwoWay (0.00s) - --- PASS: TestUnknownField/added_only/Kind([other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value_mergingList_mergingIntList_simpleMap_retainKeysMap_name])/ThreeWay (0.00s) + --- PASS: TestUnknownField/added_only/Kind([name_other_simpleMap_replacingItem_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList])/TwoWay (0.00s) + --- PASS: TestUnknownField/added_only/Kind([mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_replacingItem_name_other_simpleMap])/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([nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value_other_nonMergingList_simpleMap_retainKeysMap_name_mergingList_mergingIntList])/TwoWay (0.00s) - --- PASS: TestUnknownField/diff/Kind([simpleMap_retainKeysMap_name_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value_other_nonMergingList])/ThreeWay (0.00s) + --- PASS: TestUnknownField/diff/Kind([name_other_simpleMap_replacingItem_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList])/TwoWay (0.00s) + --- PASS: TestUnknownField/diff/Kind([name_other_simpleMap_replacingItem_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList])/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 (0.01s) --- 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([simpleMap_retainKeysMap_name_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value_other_nonMergingList])/TwoWay (0.00s) - --- PASS: TestUnknownField/discard_if_modified_all_nulls/Kind([retainKeysMergingList_value_other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_name_mergingList_mergingIntList_simpleMap_retainKeysMap])/ThreeWay (0.00s) + --- PASS: TestUnknownField/discard_if_modified_all_nulls/Kind([retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_name_other_simpleMap_replacingItem])/TwoWay (0.00s) + --- PASS: TestUnknownField/discard_if_modified_all_nulls/Kind([simpleMap_replacingItem_name_other_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList])/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([name_mergingList_mergingIntList_simpleMap_retainKeysMap_replacingItem_retainKeysMergingList_value_other_nonMergingList_nonMergingIntList_mergeItemPtr])/TwoWay (0.00s) - --- PASS: TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/Kind([name_mergingList_mergingIntList_simpleMap_retainKeysMap_replacingItem_retainKeysMergingList_value_other_nonMergingList_nonMergingIntList_mergeItemPtr])/ThreeWay (0.00s) + --- PASS: TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/Kind([mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_name_other_simpleMap_replacingItem])/TwoWay (0.00s) + --- PASS: TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/Kind([retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_name_other_simpleMap_replacingItem])/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([nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value_other_mergingIntList_simpleMap_retainKeysMap_name_mergingList])/TwoWay (0.00s) - --- PASS: TestUnknownField/filter_if_slice_is_all_empty/Kind([mergingList_mergingIntList_simpleMap_retainKeysMap_name_other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value])/ThreeWay (0.00s) + --- PASS: TestUnknownField/filter_if_slice_is_all_empty/Kind([value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_name_other_simpleMap_replacingItem])/TwoWay (0.00s) + --- PASS: TestUnknownField/filter_if_slice_is_all_empty/Kind([name_other_simpleMap_replacingItem_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList])/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([mergingList_mergingIntList_simpleMap_retainKeysMap_name_other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value])/TwoWay (0.00s) - --- PASS: TestUnknownField/filter_nulls_from_nested_slices/Kind([mergingList_mergingIntList_simpleMap_retainKeysMap_name_other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value])/ThreeWay (0.00s) + --- PASS: TestUnknownField/filter_nulls_from_nested_slices/Kind([name_other_simpleMap_replacingItem_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList])/TwoWay (0.00s) + --- PASS: TestUnknownField/filter_nulls_from_nested_slices/Kind([nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList_name_other_simpleMap_replacingItem])/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 (0.01s) --- 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([name_mergingList_mergingIntList_simpleMap_retainKeysMap_replacingItem_retainKeysMergingList_value_other_nonMergingList_nonMergingIntList_mergeItemPtr])/TwoWay (0.00s) - --- PASS: TestUnknownField/nested_null_values_in_original_are_preserved/Kind([mergingList_mergingIntList_simpleMap_retainKeysMap_name_other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value])/ThreeWay (0.00s) + --- PASS: TestUnknownField/nested_null_values_in_original_are_preserved/Kind([retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_name_other_simpleMap_replacingItem])/TwoWay (0.00s) + --- PASS: TestUnknownField/nested_null_values_in_original_are_preserved/Kind([simpleMap_replacingItem_name_other_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList])/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([other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value_mergingList_mergingIntList_simpleMap_retainKeysMap_name])/TwoWay (0.00s) - --- PASS: TestUnknownField/no_diff/Kind([value_other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_mergingList_mergingIntList_simpleMap_retainKeysMap])/ThreeWay (0.00s) + --- PASS: TestUnknownField/no_diff/Kind([name_other_simpleMap_replacingItem_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList])/TwoWay (0.00s) + --- PASS: TestUnknownField/no_diff/Kind([name_other_simpleMap_replacingItem_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr])/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([value_other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_mergingList_mergingIntList_simpleMap_retainKeysMap])/TwoWay (0.00s) - --- PASS: TestUnknownField/no_diff_even_if_modified_null/Kind([mergingList_mergingIntList_simpleMap_retainKeysMap_name_other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value])/ThreeWay (0.00s) + --- PASS: TestUnknownField/no_diff_even_if_modified_null/Kind([other_simpleMap_replacingItem_name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value])/TwoWay (0.00s) + --- PASS: TestUnknownField/no_diff_even_if_modified_null/Kind([other_simpleMap_replacingItem_name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value])/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([other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value_mergingList_mergingIntList_simpleMap_retainKeysMap_name])/TwoWay (0.00s) - --- PASS: TestUnknownField/not_filter_nulls_from_non-associative_slice/Kind([retainKeysMergingList_value_other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_name_mergingList_mergingIntList_simpleMap_retainKeysMap])/ThreeWay (0.00s) + --- PASS: TestUnknownField/not_filter_nulls_from_non-associative_slice/Kind([other_simpleMap_replacingItem_name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value])/TwoWay (0.00s) + --- PASS: TestUnknownField/not_filter_nulls_from_non-associative_slice/Kind([mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_replacingItem_name_other_simpleMap])/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([retainKeysMap_name_mergingList_mergingIntList_simpleMap_mergeItemPtr_replacingItem_retainKeysMergingList_value_other_nonMergingList_nonMergingIntList])/TwoWay (0.00s) - --- PASS: TestUnknownField/null_values_in_original_are_preserved/Kind([simpleMap_retainKeysMap_name_mergingList_mergingIntList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_value_other_nonMergingList])/ThreeWay (0.00s) + --- PASS: TestUnknownField/null_values_in_original_are_preserved/Kind([nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_simpleMap_replacingItem_name_other])/TwoWay (0.00s) + --- PASS: TestUnknownField/null_values_in_original_are_preserved/Kind([retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_name_other_simpleMap_replacingItem])/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([retainKeysMap_name_mergingList_mergingIntList_simpleMap_mergeItemPtr_replacingItem_retainKeysMergingList_value_other_nonMergingList_nonMergingIntList])/TwoWay (0.00s) - --- PASS: TestUnknownField/removed_only/Kind([value_other_nonMergingList_nonMergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_mergingList_mergingIntList_simpleMap_retainKeysMap])/ThreeWay (0.00s) + --- PASS: TestUnknownField/removed_only/Kind([value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_name_other_simpleMap_replacingItem])/TwoWay (0.00s) + --- PASS: TestUnknownField/removed_only/Kind([mergeItemPtr_retainKeysMap_retainKeysMergingList_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_name_other_simpleMap_replacingItem])/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 16.223s +ok k8s.io/apimachinery/pkg/util/strategicpatch 14.465s === RUN TestIsDNS1123Label --- PASS: TestIsDNS1123Label (0.00s) === RUN TestIsDNS1123Subdomain @@ -18241,19 +18278,19 @@ === RUN TestIsFullyQualifiedDomainName --- PASS: TestIsFullyQualifiedDomainName (0.00s) === RUN TestIsFullyQualifiedName ---- PASS: TestIsFullyQualifiedName (0.00s) +--- PASS: TestIsFullyQualifiedName (0.02s) === RUN TestIsDomainPrefixedPath --- PASS: TestIsDomainPrefixedPath (0.00s) === RUN TestIsValidSocketAddr --- PASS: TestIsValidSocketAddr (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/validation 0.086s +ok k8s.io/apimachinery/pkg/util/validation 0.092s === 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)(0x15041b0), KV:map[string]int{"Billy":2}}: detail + errors_test.go:97: message: foo: Invalid value: field.complicated{Baz:1, Qux:"aoeu", Inner:(*field.complicated)(0xcbe1b0), KV:map[string]int{"Billy":2}}: detail --- PASS: TestErrorUsefulMessage (0.00s) === RUN TestToAggregate --- PASS: TestToAggregate (0.00s) @@ -18266,7 +18303,7 @@ === RUN TestPathMultiArg --- PASS: TestPathMultiArg (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/validation/field 0.024s +ok k8s.io/apimachinery/pkg/util/validation/field 0.035s === RUN TestSemanticVersions --- PASS: TestSemanticVersions (0.00s) === RUN TestBadSemanticVersions @@ -18278,9 +18315,9 @@ === RUN TestComponents --- PASS: TestComponents (0.00s) === RUN TestHighestSupportedVersion ---- PASS: TestHighestSupportedVersion (0.01s) +--- PASS: TestHighestSupportedVersion (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/version 0.060s +ok k8s.io/apimachinery/pkg/util/version 0.023s === RUN TestInterrupted === RUN TestInterrupted/#00 === RUN TestInterrupted/#01 @@ -18297,7 +18334,7 @@ === RUN TestInterrupted/#12 === RUN TestInterrupted/#13 === RUN TestInterrupted/#14 ---- PASS: TestInterrupted (0.00s) +--- PASS: TestInterrupted (0.03s) --- PASS: TestInterrupted/#00 (0.00s) --- PASS: TestInterrupted/#01 (0.00s) --- PASS: TestInterrupted/#02 (0.00s) @@ -18334,7 +18371,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.63s) --- 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) @@ -18347,10 +18384,10 @@ --- 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.00s) - --- PASS: Test_loopConditionUntilContext_semantic/context_at_deadline_no_attempts_expected (0.01s) + --- 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.61s) - --- 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.01s) === 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 @@ -18362,10 +18399,10 @@ === RUN Test_loopConditionUntilContext_Elapsed === RUN Test_loopConditionUntilContext_Elapsed/variable_timer_with_jitter === NAME Test_loopConditionUntilContext_Elapsed - loop_test.go:503: elapsed duration 39.396905ms > expected max duration 30ms + loop_test.go:503: elapsed duration 37.549629ms > expected max duration 30ms === RUN Test_loopConditionUntilContext_Elapsed/fixed_timer === NAME Test_loopConditionUntilContext_Elapsed - loop_test.go:503: elapsed duration 39.319312ms > expected max duration 20ms + loop_test.go:503: elapsed duration 39.815066ms > 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) @@ -18390,7 +18427,7 @@ === RUN TestJitterUntilRecoversPanic --- PASS: TestJitterUntilRecoversPanic (0.01s) === RUN TestJitterUntilNegativeFactor ---- PASS: TestJitterUntilNegativeFactor (1.00s) +--- PASS: TestJitterUntilNegativeFactor (1.01s) === RUN TestExponentialBackoff --- PASS: TestExponentialBackoff (0.00s) === RUN TestPoller @@ -18404,7 +18441,7 @@ === RUN TestPollImmediateError --- PASS: TestPollImmediateError (0.00s) === RUN TestPollForever ---- PASS: TestPollForever (0.04s) +--- PASS: TestPollForever (0.03s) === RUN Test_waitFor --- PASS: Test_waitFor (0.00s) === RUN Test_waitForWithEarlyClosing_waitFunc @@ -18414,7 +18451,7 @@ === RUN Test_waitForWithContextCancelsContext --- PASS: Test_waitForWithContextCancelsContext (0.02s) === RUN TestPollUntil ---- PASS: TestPollUntil (0.00s) +--- PASS: TestPollUntil (0.01s) === RUN TestBackoff_Step === RUN TestBackoff_Step/(*wait.Backoff)(nil)_seed=0 wait_test.go:688: [0]=0s @@ -18616,7 +18653,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.02s) +--- PASS: TestBackoff_Step (0.03s) --- 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) @@ -18637,7 +18674,7 @@ --- PASS: TestBackoff_Step/&wait.Backoff{Duration:1000000000,_Factor:2,_Jitter:4,_Steps:6,_Cap:0}_seed=1 (0.00s) --- PASS: TestBackoff_Step/(*wait.Backoff)(nil)_seed=2 (0.00s) --- PASS: TestBackoff_Step/&wait.Backoff{Duration:1000000000,_Factor:0,_Jitter:0,_Steps:-1,_Cap:0}_seed=2 (0.00s) - --- PASS: TestBackoff_Step/&wait.Backoff{Duration:1000000000,_Factor:0,_Jitter:0,_Steps:0,_Cap:0}_seed=2 (0.01s) + --- PASS: TestBackoff_Step/&wait.Backoff{Duration:1000000000,_Factor:0,_Jitter:0,_Steps:0,_Cap:0}_seed=2 (0.00s) --- PASS: TestBackoff_Step/&wait.Backoff{Duration:1000000000,_Factor:0,_Jitter:0,_Steps:1,_Cap:0}_seed=2 (0.00s) --- PASS: TestBackoff_Step/&wait.Backoff{Duration:1000000000,_Factor:1,_Jitter:0,_Steps:1,_Cap:0}_seed=2 (0.00s) --- PASS: TestBackoff_Step/&wait.Backoff{Duration:1000000000,_Factor:2,_Jitter:0,_Steps:3,_Cap:0}_seed=2 (0.00s) @@ -18669,7 +18706,7 @@ === RUN TestJitteredBackoffManagerGetNextBackoff --- PASS: TestJitteredBackoffManagerGetNextBackoff (0.00s) === RUN TestJitterBackoffManagerWithRealClock ---- PASS: TestJitterBackoffManagerWithRealClock (0.02s) +--- PASS: TestJitterBackoffManagerWithRealClock (0.01s) === RUN TestExponentialBackoffManagerWithRealClock --- PASS: TestExponentialBackoffManagerWithRealClock (0.06s) === RUN TestBackoffDelayWithResetExponential @@ -18681,7 +18718,7 @@ === RUN TestBackoffDelayWithResetWithRealClockJitter --- PASS: TestBackoffDelayWithResetWithRealClockJitter (0.02s) === RUN TestBackoffDelayWithResetWithRealClockExponential ---- PASS: TestBackoffDelayWithResetWithRealClockExponential (0.07s) +--- PASS: TestBackoffDelayWithResetWithRealClockExponential (0.06s) === RUN TestExponentialBackoffWithContext === RUN TestExponentialBackoffWithContext/no_attempts_expected_with_zero_backoff_steps === RUN TestExponentialBackoffWithContext/condition_returns_false_with_single_backoff_step @@ -18715,14 +18752,14 @@ --- PASS: TestExponentialBackoffWithContext/condition_returns_true_after_certain_attempts_with_multiple_backoff_steps_and_zero_duration (0.00s) --- PASS: TestExponentialBackoffWithContext/condition_returns_error_no_further_attempts_expected#01 (0.00s) --- PASS: TestExponentialBackoffWithContext/context_already_canceled_no_attempts_expected#01 (0.00s) - --- PASS: TestExponentialBackoffWithContext/context_at_deadline_no_attempts_expected#01 (0.01s) + --- PASS: TestExponentialBackoffWithContext/context_at_deadline_no_attempts_expected#01 (0.00s) === RUN TestPollImmediateUntilWithContext === RUN TestPollImmediateUntilWithContext/condition_throws_error_on_immediate_attempt,_no_retry_is_attempted === RUN TestPollImmediateUntilWithContext/condition_returns_done=true_on_immediate_attempt,_no_retry_is_attempted === 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) @@ -18765,25 +18802,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.074s +ok k8s.io/apimachinery/pkg/util/wait 4.120s === RUN TestRateLimitedSafeWaitGroup ---- PASS: TestRateLimitedSafeWaitGroup (2.14s) +--- PASS: TestRateLimitedSafeWaitGroup (2.13s) === RUN TestRateLimitedSafeWaitGroupWithHardTimeout --- PASS: TestRateLimitedSafeWaitGroupWithHardTimeout (0.00s) === RUN TestRateLimitedSafeWaitGroupWithBurstOfOne - ratelimited_waitgroup_test.go:247: Wait starting, N=200, grace: 5s, at: 2024-05-18 08:11:55.066277053 +0000 UTC m=+2.153846685 - ratelimited_waitgroup_test.go:255: Wait finished, count(before): 200, count(after): 0, took: 4.977627291s, err: + ratelimited_waitgroup_test.go:247: Wait starting, N=200, grace: 5s, at: 2024-05-18 08:22:29.811295955 +0000 UTC m=+2.138391430 + ratelimited_waitgroup_test.go:255: Wait finished, count(before): 200, count(after): 0, took: 4.976579783s, 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.148s +ok k8s.io/apimachinery/pkg/util/waitgroup 7.163s === RUN TestYAMLDecoderReadBytesLength --- PASS: TestYAMLDecoderReadBytesLength (0.00s) === RUN TestBigYAML ---- PASS: TestBigYAML (0.57s) +--- PASS: TestBigYAML (0.56s) === RUN TestYAMLDecoderCallsAfterErrShortBufferRestOfFrame --- PASS: TestYAMLDecoderCallsAfterErrShortBufferRestOfFrame (0.00s) === RUN TestSplitYAMLDocument @@ -18807,15 +18844,15 @@ === RUN TestYAMLOrJSONDecoder --- PASS: TestYAMLOrJSONDecoder (0.00s) === RUN TestReadSingleLongLine ---- PASS: TestReadSingleLongLine (0.06s) +--- PASS: TestReadSingleLongLine (0.04s) === RUN TestReadRandomLineLengths ---- PASS: TestReadRandomLineLengths (1.80s) +--- PASS: TestReadRandomLineLengths (1.00s) === RUN TestTypedJSONOrYamlErrors --- PASS: TestTypedJSONOrYamlErrors (0.00s) === RUN TestUnmarshal --- PASS: TestUnmarshal (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/yaml 2.500s +ok k8s.io/apimachinery/pkg/util/yaml 1.657s === RUN TestCompareKubeAwareVersionStrings --- PASS: TestCompareKubeAwareVersionStrings (0.00s) === RUN Test_parseKubeVersion @@ -18831,8 +18868,7 @@ --- PASS: Test_parseKubeVersion/beta_version (0.00s) --- PASS: Test_parseKubeVersion/ga_version (0.00s) PASS -ok k8s.io/apimachinery/pkg/version 0.020s -? k8s.io/apimachinery/third_party/forked/golang/netutil [no test files] +ok k8s.io/apimachinery/pkg/version 0.033s === RUN TestBroadcaster mux_test.go:86: Sending 0 mux_test.go:86: Sending 1 @@ -18841,9 +18877,9 @@ mux_test.go:77: Got (ADDED, &watch.myType{ID:"foo", Value:"hello world 1"}) mux_test.go:77: Got (ADDED, &watch.myType{ID:"foo", Value:"hello world 1"}) mux_test.go:77: Got (ADDED, &watch.myType{ID:"bar", Value:"hello world 2"}) - mux_test.go:77: Got (MODIFIED, &watch.myType{ID:"foo", Value:"goodbye world 3"}) mux_test.go:77: Got (ADDED, &watch.myType{ID:"bar", Value:"hello world 2"}) mux_test.go:77: Got (MODIFIED, &watch.myType{ID:"foo", Value:"goodbye world 3"}) + mux_test.go:77: Got (MODIFIED, &watch.myType{ID:"foo", Value:"goodbye world 3"}) mux_test.go:77: Got (DELETED, &watch.myType{ID:"bar", Value:"hello world 4"}) mux_test.go:77: Got (DELETED, &watch.myType{ID:"bar", Value:"hello world 4"}) --- PASS: TestBroadcaster (0.00s) @@ -18887,17 +18923,17 @@ === RUN TestProxyWatcher --- PASS: TestProxyWatcher (0.00s) PASS -ok k8s.io/apimachinery/pkg/watch 0.072s +ok k8s.io/apimachinery/pkg/watch 0.057s === RUN TestLookupPtrToStruct --- PASS: TestLookupPtrToStruct (0.00s) PASS -ok k8s.io/apimachinery/third_party/forked/golang/json 0.033s +ok k8s.io/apimachinery/third_party/forked/golang/json 0.055s === RUN TestEqualities --- PASS: TestEqualities (0.00s) === RUN TestDerivatives --- PASS: TestDerivatives (0.00s) PASS -ok k8s.io/apimachinery/third_party/forked/golang/reflect 0.032s +ok k8s.io/apimachinery/third_party/forked/golang/reflect 0.041s create-stamp debian/debhelper-build-stamp dh_testroot -O--builddirectory=_build -O--buildsystem=golang dh_prep -O--builddirectory=_build -O--buildsystem=golang @@ -18924,12 +18960,14 @@ dpkg-buildpackage: info: binary-only upload (no source included) dpkg-genchanges: info: not including original source code in upload I: copying local configuration +I: user script /srv/workspace/pbuilder/4210/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/4210/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/29243 and its subdirectories -I: Current time: Fri May 17 20:12:44 -12 2024 -I: pbuilder-time-stamp: 1716019964 +I: removing directory /srv/workspace/pbuilder/4210 and its subdirectories +I: Current time: Sat May 18 22:23:38 +14 2024 +I: pbuilder-time-stamp: 1716020618