Diff of the two buildlogs: -- --- b1/build.log 2024-01-22 17:29:22.571648246 +0000 +++ b2/build.log 2024-01-22 17:44:46.893473435 +0000 @@ -1,6 +1,6 @@ I: pbuilder: network access will be disabled during build -I: Current time: Mon Jan 22 04:17:48 -12 2024 -I: pbuilder-time-stamp: 1705940268 +I: Current time: Tue Jan 23 07:29:33 +14 2024 +I: pbuilder-time-stamp: 1705944573 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/12112/tmp/hooks/D02_print_environment starting +I: user script /srv/workspace/pbuilder/16561/tmp/hooks/D01_modify_environment starting +debug: Running on virt64c. +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 Jan 22 17:29 /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/16561/tmp/hooks/D01_modify_environment finished +I: user script /srv/workspace/pbuilder/16561/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='061cff20b9c1405b9d3112861b2c24b0' - 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='12112' - PS1='# ' - PS2='> ' + INVOCATION_ID=400a048af3384e26b0149138e0305e1c + 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=16561 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.7IAYA9Kc/pbuilderrc_iYxa --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.7IAYA9Kc/b1 --logfile b1/build.log golang-k8s-apimachinery_0.29.0-2.dsc' - SUDO_GID='116' - SUDO_UID='112' - 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.7IAYA9Kc/pbuilderrc_lUFF --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.7IAYA9Kc/b2 --logfile b2/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-14 + UID=0 + USER=root + _='I: set' + http_proxy=http://10.0.0.15:3142/ I: uname -a - Linux cbxi4b 6.1.0-17-armmp #1 SMP Debian 6.1.69-1 (2023-12-30) armv7l GNU/Linux + Linux i-capture-the-hostname 6.1.0-17-arm64 #1 SMP Debian 6.1.69-1 (2023-12-30) aarch64 GNU/Linux I: ls -l /bin - lrwxrwxrwx 1 root root 7 Jan 22 07:47 /bin -> usr/bin -I: user script /srv/workspace/pbuilder/12112/tmp/hooks/D02_print_environment finished + lrwxrwxrwx 1 root root 7 Jan 21 10:46 /bin -> usr/bin +I: user script /srv/workspace/pbuilder/16561/tmp/hooks/D02_print_environment finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy @@ -267,7 +299,7 @@ Get: 110 http://deb.debian.org/debian unstable/main armhf golang-k8s-sigs-structured-merge-diff-dev all 4.4.1+ds1-1 [152 kB] Get: 111 http://deb.debian.org/debian unstable/main armhf golang-k8s-utils-dev all 0.0~git20240102.e7106e6-1 [88.9 kB] Get: 112 http://deb.debian.org/debian unstable/main armhf golang-k8s-kube-openapi-dev all 0.0~git20231214.ab13479-1 [971 kB] -Fetched 76.5 MB in 18s (4208 kB/s) +Fetched 76.5 MB in 3s (23.4 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 ... 19618 files and directories currently installed.) @@ -730,7 +762,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/16561/tmp/hooks/A99_set_merged_usr starting +Not re-configuring usrmerge for unstable +I: user script /srv/workspace/pbuilder/16561/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 @@ -749,29 +785,28 @@ 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 internal/goarch k8s.io/apimachinery -internal/unsafeheader -internal/coverage/rtcov internal/cpu +internal/coverage/rtcov internal/abi internal/godebugs internal/goexperiment internal/goos runtime/internal/math -internal/bytealg -runtime/internal/atomic runtime/internal/sys runtime/internal/syscall +internal/bytealg +runtime/internal/atomic internal/itoa math/bits unicode/utf8 +math internal/race sync/atomic -math unicode -runtime encoding unicode/utf16 log/internal @@ -783,54 +818,77 @@ vendor/golang.org/x/crypto/internal/alias k8s.io/apimachinery/pkg/selection k8s.io/utils/strings/slices +runtime 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 google.golang.org/protobuf/internal/set github.com/onsi/ginkgo/v2/config -k8s.io/klog/internal/dbg internal/reflectlite sync crypto/subtle +k8s.io/klog/internal/dbg internal/testlog -runtime/cgo internal/bisect +runtime/cgo +internal/singleflight +internal/sysinfo +google.golang.org/protobuf/internal/pragma +internal/godebug +github.com/josharian/intern errors sort +math/rand strconv io internal/oserror syscall -reflect internal/safefilepath path +reflect bytes +strings +bufio internal/syscall/unix time internal/syscall/execenv -strings -bufio regexp/syntax -internal/poll +go/build/constraint +k8s.io/apimachinery/pkg/util/sets +regexp internal/fmtsort +internal/poll io/fs encoding/binary -regexp -os -encoding/base64 -go/build/constraint -k8s.io/apimachinery/pkg/util/sets context -fmt -path/filepath -internal/lazyregexp +os github.com/go-logr/logr +encoding/base64 k8s.io/klog/internal/severity -k8s.io/klog/internal/buffer k8s.io/klog/internal/clock hash +crypto/cipher +crypto/internal/randutil hash/crc32 +crypto +crypto/internal/edwards25519/field +crypto/internal/nistec/fiat +crypto/internal/boring +crypto/des +crypto/aes +crypto/sha512 +crypto/internal/edwards25519 +fmt +path/filepath +internal/lazyregexp +k8s.io/klog/internal/buffer +crypto/hmac +crypto/md5 +crypto/rc4 +crypto/sha1 +crypto/sha256 +encoding/pem encoding/json log go/token @@ -838,15 +896,15 @@ go/scanner go/ast k8s.io/apimachinery/third_party/forked/golang/reflect -github.com/gogo/protobuf/proto k8s.io/apimachinery/pkg/conversion +github.com/gogo/protobuf/proto net/url +k8s.io/apimachinery/pkg/util/errors +sigs.k8s.io/json/internal/golang/encoding/json go/doc go/internal/typeparams go/parser k8s.io/apimachinery/pkg/conversion/queryparams -k8s.io/apimachinery/pkg/util/errors -sigs.k8s.io/json/internal/golang/encoding/json runtime/debug k8s.io/apimachinery/pkg/util/naming flag @@ -855,100 +913,79 @@ sigs.k8s.io/json k8s.io/apimachinery/pkg/util/json compress/flate +math/big compress/gzip -crypto -crypto/cipher -crypto/internal/boring -crypto/internal/randutil -internal/godebug +crypto/internal/nistec +crypto/ecdh +encoding/hex +vendor/golang.org/x/net/dns/dnsmessage k8s.io/klog -math/rand -math/big -crypto/aes -crypto/des -crypto/internal/edwards25519/field -crypto/internal/nistec/fiat -k8s.io/apimachinery/pkg/runtime/schema -crypto/sha512 -crypto/internal/edwards25519 crypto/rand +crypto/elliptic crypto/internal/bigmod crypto/internal/boring/bbig encoding/asn1 crypto/ed25519 -crypto/hmac -crypto/md5 -crypto/rc4 crypto/rsa -vendor/golang.org/x/crypto/cryptobyte -crypto/sha1 -crypto/sha256 crypto/dsa -encoding/hex -encoding/pem -crypto/x509/pkix -vendor/golang.org/x/net/dns/dnsmessage -internal/singleflight internal/intern net/netip -crypto/internal/nistec vendor/golang.org/x/crypto/chacha20 -net +vendor/golang.org/x/crypto/cryptobyte +crypto/x509/pkix vendor/golang.org/x/crypto/internal/poly1305 +k8s.io/apimachinery/pkg/runtime/schema vendor/golang.org/x/crypto/chacha20poly1305 +net vendor/golang.org/x/crypto/hkdf vendor/golang.org/x/text/transform -crypto/ecdh -crypto/elliptic vendor/golang.org/x/text/unicode/bidi crypto/ecdsa -vendor/golang.org/x/text/secure/bidirule vendor/golang.org/x/text/unicode/norm vendor/golang.org/x/net/http2/hpack +vendor/golang.org/x/text/secure/bidirule mime mime/quotedprintable net/http/internal net/http/internal/ascii io/ioutil -github.com/modern-go/concurrent github.com/modern-go/reflect2 -vendor/golang.org/x/net/idna +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 -crypto/x509 -net/textproto -vendor/golang.org/x/net/http/httpguts -vendor/golang.org/x/net/http/httpproxy -mime/multipart -sigs.k8s.io/structured-merge-diff/value github.com/gogo/protobuf/sortkeys github.com/google/gofuzz/bytesource github.com/google/gofuzz +github.com/json-iterator/go gopkg.in/inf.v0 -crypto/tls +sigs.k8s.io/yaml k8s.io/apimachinery/pkg/api/resource +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 k8s.io/apimachinery/pkg/util/intstr -k8s.io/apimachinery/pkg/util/validation golang.org/x/text/transform -k8s.io/apimachinery/pkg/labels golang.org/x/text/unicode/bidi golang.org/x/text/unicode/norm golang.org/x/text/secure/bidirule +sigs.k8s.io/structured-merge-diff/value golang.org/x/net/http2/hpack github.com/golang/protobuf/proto golang.org/x/net/idna -net/http/httptrace -net/http +crypto/x509 +net/textproto +vendor/golang.org/x/net/http/httpproxy +vendor/golang.org/x/net/http/httpguts +mime/multipart +k8s.io/utils/internal/third_party/forked/golang/net +k8s.io/utils/net +k8s.io/apimachinery/pkg/util/validation golang.org/x/net/http/httpguts github.com/google/go-cmp/cmp/internal/diff +k8s.io/apimachinery/pkg/labels github.com/google/go-cmp/cmp/internal/function +crypto/tls github.com/google/go-cmp/cmp/internal/value github.com/google/go-cmp/cmp encoding/csv @@ -956,7 +993,6 @@ github.com/davecgh/go-spew/spew k8s.io/apimachinery/pkg/util/dump os/exec -internal/sysinfo runtime/trace testing k8s.io/apimachinery/pkg/util/duration @@ -965,67 +1001,101 @@ k8s.io/utils/clock k8s.io/apimachinery/pkg/util/cache text/tabwriter -k8s.io/apimachinery/pkg/util/diff hash/adler32 compress/zlib +k8s.io/apimachinery/pkg/util/diff golang.org/x/net/internal/socks -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 +github.com/evanphx/json-patch hash/fnv google.golang.org/protobuf/internal/detrand google.golang.org/protobuf/internal/errors +k8s.io/apimachinery/pkg/util/jsonmergepatch google.golang.org/protobuf/encoding/protowire -k8s.io/apimachinery/pkg/util/runtime -golang.org/x/net/http2 -k8s.io/apimachinery/pkg/runtime -k8s.io/apimachinery/pkg/util/httpstream -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 -google.golang.org/protobuf/internal/pragma -google.golang.org/protobuf/reflect/protoreflect -k8s.io/apimachinery/pkg/util/net google.golang.org/protobuf/internal/version gopkg.in/yaml.v3 +google.golang.org/protobuf/reflect/protoreflect +net/http/httptrace +net/http +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 -k8s.io/apimachinery/pkg/watch google.golang.org/protobuf/reflect/protoregistry -k8s.io/apimachinery/pkg/apis/meta/v1 google.golang.org/protobuf/runtime/protoiface -google.golang.org/protobuf/proto 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/google/gnostic-models/jsonschema +github.com/PuerkitoBio/purell google.golang.org/protobuf/internal/encoding/defval -google.golang.org/protobuf/internal/filedesc google.golang.org/protobuf/encoding/prototext -github.com/PuerkitoBio/urlesc -golang.org/x/text/width -github.com/PuerkitoBio/purell -github.com/josharian/intern +google.golang.org/protobuf/internal/filedesc +github.com/google/gnostic-models/jsonschema github.com/mailru/easyjson/jlexer github.com/mailru/easyjson/buffer -google.golang.org/protobuf/internal/encoding/tag 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 +k8s.io/apimachinery/pkg/util/runtime +k8s.io/apimachinery/pkg/runtime +golang.org/x/net/http2 +k8s.io/apimachinery/pkg/util/httpstream +github.com/moby/spdystream/spdy +net/http/httputil +github.com/moby/spdystream +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 +google.golang.org/protobuf/internal/filetype github.com/go-openapi/swag +google.golang.org/protobuf/runtime/protoimpl +google.golang.org/protobuf/types/known/anypb +github.com/google/gnostic-models/extensions +github.com/google/gnostic-models/compiler +github.com/onsi/ginkgo/v2/reporters +github.com/go-openapi/jsonpointer +github.com/google/gnostic-models/openapiv2 +github.com/google/gnostic-models/openapiv3 +k8s.io/apimachinery/pkg/util/net +github.com/go-openapi/jsonreference +k8s.io/kube-openapi/pkg/internal +html +k8s.io/apimachinery/pkg/watch +text/template/parse +k8s.io/apimachinery/pkg/apis/meta/v1 +text/template +html/template +net/rpc +github.com/onsi/ginkgo/v2/internal/parallel_support +os/signal +github.com/onsi/ginkgo/v2/internal/interrupt_handler +golang.org/x/sys/unix +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/api/equality @@ -1036,82 +1106,48 @@ k8s.io/apimachinery/pkg/api/apitesting/fuzzer k8s.io/apimachinery/pkg/apis/meta/v1beta1 k8s.io/apimachinery/pkg/api/errors -k8s.io/apimachinery/pkg/apis/meta/fuzzer k8s.io/apimachinery/pkg/api/meta/table -k8s.io/apimachinery/pkg/api/apitesting/roundtrip +k8s.io/apimachinery/pkg/apis/meta/fuzzer k8s.io/apimachinery/pkg/api/meta/testrestmapper k8s.io/apimachinery/pkg/apis/meta/v1/validation -k8s.io/apimachinery/pkg/api/validation +k8s.io/apimachinery/pkg/api/apitesting/roundtrip k8s.io/apimachinery/pkg/apis/meta/internalversion +k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructuredscheme +k8s.io/apimachinery/pkg/api/validation k8s.io/apimachinery/pkg/apis/meta/internalversion/scheme 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/apis/testapigroup/v1 k8s.io/apimachinery/pkg/util/remotecommand +k8s.io/apimachinery/pkg/apis/testapigroup/v1 k8s.io/apimachinery/pkg/util/httpstream/wsstream +k8s.io/kube-openapi/pkg/schemaconv +github.com/onsi/ginkgo/v2/internal k8s.io/apimachinery/pkg/util/httpstream/spdy -google.golang.org/protobuf/internal/filetype -github.com/go-openapi/jsonpointer +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 -google.golang.org/protobuf/runtime/protoimpl -github.com/go-openapi/jsonreference -google.golang.org/protobuf/types/known/anypb -encoding/base32 -sigs.k8s.io/structured-merge-diff/schema -k8s.io/kube-openapi/pkg/internal/third_party/go-json-experiment/json -github.com/google/gnostic-models/extensions -sigs.k8s.io/structured-merge-diff/fieldpath -github.com/google/gnostic-models/compiler -github.com/google/gnostic-models/openapiv2 -github.com/google/gnostic-models/openapiv3 -k8s.io/kube-openapi/pkg/internal -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 -k8s.io/kube-openapi/pkg/util/proto -k8s.io/kube-openapi/pkg/validation/spec -github.com/onsi/ginkgo/v2/reporters -html -text/template/parse -os/signal -k8s.io/kube-openapi/pkg/schemaconv -golang.org/x/sys/unix -k8s.io/apimachinery/pkg/util/managedfields/internal -text/template -k8s.io/apimachinery/pkg/util/managedfields -html/template -k8s.io/apimachinery/pkg/util/managedfields/internal/testing -k8s.io/apimachinery/pkg/util/managedfields/managedfieldstest k8s.io/apimachinery/pkg/util/rand k8s.io/apimachinery/third_party/forked/golang/json -net/rpc -k8s.io/apimachinery/pkg/util/strategicpatch k8s.io/kube-openapi/pkg/spec3 -github.com/onsi/ginkgo/v2/internal/parallel_support +k8s.io/apimachinery/pkg/util/strategicpatch +k8s.io/apimachinery/pkg/util/managedfields +k8s.io/apimachinery/pkg/util/managedfields/internal/testing +github.com/onsi/ginkgo/v2/internal/global +k8s.io/apimachinery/pkg/util/managedfields/managedfieldstest +github.com/onsi/ginkgo/v2/internal/testingtproxy database/sql/driver -github.com/onsi/ginkgo/v2/internal/interrupt_handler -github.com/onsi/ginkgo/v2/internal -github.com/google/uuid -k8s.io/apimachinery/pkg/util/uuid +github.com/onsi/ginkgo/v2 k8s.io/apimachinery/pkg/util/version -k8s.io/apimachinery/pkg/util/wait k8s.io/apimachinery/pkg/util/strategicpatch/testing +github.com/google/uuid +k8s.io/apimachinery/pkg/util/wait +k8s.io/apimachinery/pkg/util/net/testing k8s.io/apimachinery/pkg/util/waitgroup +k8s.io/apimachinery/pkg/util/uuid 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 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 @@ -1119,14 +1155,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.184s -? k8s.io/apimachinery/pkg/api/apitesting/naming [no test files] +ok k8s.io/apimachinery/pkg/api/apitesting/fuzzer 0.025s ? k8s.io/apimachinery/pkg/api/apitesting/roundtrip [no test files] ? k8s.io/apimachinery/pkg/api/equality [no test files] === RUN TestErrorNew @@ -1171,7 +1207,7 @@ === RUN TestIsUnexpectedObjectError/Nested_match === RUN TestIsUnexpectedObjectError/Nested,_no_match === RUN TestIsUnexpectedObjectError/Nil ---- PASS: TestIsUnexpectedObjectError (0.01s) +--- PASS: TestIsUnexpectedObjectError (0.00s) --- PASS: TestIsUnexpectedObjectError/Direct_match (0.00s) --- PASS: TestIsUnexpectedObjectError/No_match (0.00s) --- PASS: TestIsUnexpectedObjectError/Nested_match (0.00s) @@ -1204,7 +1240,7 @@ === RUN TestIsErrorTypesByReasonAndCode/NotFound/by_known_reason === RUN TestIsErrorTypesByReasonAndCode/NotFound/by_code_and_unknown_reason === RUN TestIsErrorTypesByReasonAndCode/NotFound/by_code_and_other_known_reason ---- PASS: TestIsErrorTypesByReasonAndCode (0.02s) +--- PASS: TestIsErrorTypesByReasonAndCode (0.00s) --- PASS: TestIsErrorTypesByReasonAndCode/IsRequestEntityTooLarge (0.00s) --- PASS: TestIsErrorTypesByReasonAndCode/IsRequestEntityTooLarge/by_known_reason (0.00s) --- PASS: TestIsErrorTypesByReasonAndCode/IsRequestEntityTooLarge/by_code_and_unknown_reason (0.00s) @@ -1215,20 +1251,21 @@ --- PASS: TestIsErrorTypesByReasonAndCode/Forbidden/by_known_reason (0.00s) --- PASS: TestIsErrorTypesByReasonAndCode/Forbidden/by_code_and_unknown_reason (0.00s) --- PASS: TestIsErrorTypesByReasonAndCode/Forbidden/by_code_and_other_known_reason (0.00s) - --- PASS: TestIsErrorTypesByReasonAndCode/NotFound (0.01s) + --- PASS: TestIsErrorTypesByReasonAndCode/NotFound (0.00s) --- PASS: TestIsErrorTypesByReasonAndCode/NotFound/by_known_reason (0.00s) --- PASS: TestIsErrorTypesByReasonAndCode/NotFound/by_code_and_unknown_reason (0.00s) --- PASS: TestIsErrorTypesByReasonAndCode/NotFound/by_code_and_other_known_reason (0.00s) === RUN TestStatusCauseSupportsWrappedErrors --- PASS: TestStatusCauseSupportsWrappedErrors (0.00s) PASS -ok k8s.io/apimachinery/pkg/api/errors 0.284s +ok k8s.io/apimachinery/pkg/api/errors 0.017s +? k8s.io/apimachinery/pkg/api/meta/table [no test files] === RUN TestSetStatusCondition === RUN TestSetStatusCondition/should-add === RUN TestSetStatusCondition/use-supplied-time === RUN TestSetStatusCondition/update-fields === RUN TestSetStatusCondition/nothing_changes ---- PASS: TestSetStatusCondition (0.01s) +--- PASS: TestSetStatusCondition (0.00s) --- PASS: TestSetStatusCondition/should-add (0.00s) --- PASS: TestSetStatusCondition/use-supplied-time (0.00s) --- PASS: TestSetStatusCondition/update-fields (0.00s) @@ -1237,7 +1274,7 @@ === RUN TestRemoveStatusCondition/present === RUN TestRemoveStatusCondition/not-present === RUN TestRemoveStatusCondition/empty_conditions ---- PASS: TestRemoveStatusCondition (0.01s) +--- PASS: TestRemoveStatusCondition (0.00s) --- PASS: TestRemoveStatusCondition/present (0.00s) --- PASS: TestRemoveStatusCondition/not-present (0.00s) --- PASS: TestRemoveStatusCondition/empty_conditions (0.00s) @@ -1251,7 +1288,7 @@ === RUN TestIsStatusConditionPresentAndEqual/doesnt-match-true === RUN TestIsStatusConditionPresentAndEqual/does-match-true === RUN TestIsStatusConditionPresentAndEqual/does-match-false ---- PASS: TestIsStatusConditionPresentAndEqual (0.01s) +--- PASS: TestIsStatusConditionPresentAndEqual (0.00s) --- PASS: TestIsStatusConditionPresentAndEqual/doesnt-match-true (0.00s) --- PASS: TestIsStatusConditionPresentAndEqual/does-match-true (0.00s) --- PASS: TestIsStatusConditionPresentAndEqual/does-match-false (0.00s) @@ -1260,7 +1297,7 @@ === RUN TestErrorMatching/AmbiguousKindError === RUN TestErrorMatching/NoResourceMatchError === RUN TestErrorMatching/NoKindMatchError ---- PASS: TestErrorMatching (0.01s) +--- PASS: TestErrorMatching (0.00s) --- PASS: TestErrorMatching/AmbiguousResourceError (0.00s) --- PASS: TestErrorMatching/AmbiguousKindError (0.00s) --- PASS: TestErrorMatching/NoResourceMatchError (0.00s) @@ -1278,19 +1315,19 @@ === RUN TestEachList/UnstructuredList === RUN TestEachList/UnstructuredList/EachListItem === RUN TestEachList/UnstructuredList/EachListItemWithAlloc ---- PASS: TestEachList (0.41s) - --- PASS: TestEachList/StructReceiverList (0.07s) - --- PASS: TestEachList/StructReceiverList/EachListItem (0.03s) - --- PASS: TestEachList/StructReceiverList/EachListItemWithAlloc (0.05s) - --- PASS: TestEachList/PointerReceiverList (0.09s) - --- PASS: TestEachList/PointerReceiverList/EachListItem (0.03s) - --- PASS: TestEachList/PointerReceiverList/EachListItemWithAlloc (0.05s) - --- PASS: TestEachList/RawExtensionList (0.14s) - --- PASS: TestEachList/RawExtensionList/EachListItem (0.08s) - --- PASS: TestEachList/RawExtensionList/EachListItemWithAlloc (0.05s) - --- PASS: TestEachList/UnstructuredList (0.10s) - --- PASS: TestEachList/UnstructuredList/EachListItem (0.06s) - --- PASS: TestEachList/UnstructuredList/EachListItemWithAlloc (0.04s) +--- PASS: TestEachList (0.09s) + --- PASS: TestEachList/StructReceiverList (0.02s) + --- PASS: TestEachList/StructReceiverList/EachListItem (0.01s) + --- PASS: TestEachList/StructReceiverList/EachListItemWithAlloc (0.01s) + --- PASS: TestEachList/PointerReceiverList (0.02s) + --- PASS: TestEachList/PointerReceiverList/EachListItem (0.01s) + --- PASS: TestEachList/PointerReceiverList/EachListItemWithAlloc (0.01s) + --- PASS: TestEachList/RawExtensionList (0.03s) + --- PASS: TestEachList/RawExtensionList/EachListItem (0.02s) + --- PASS: TestEachList/RawExtensionList/EachListItemWithAlloc (0.01s) + --- PASS: TestEachList/UnstructuredList (0.02s) + --- PASS: TestEachList/UnstructuredList/EachListItem (0.01s) + --- PASS: TestEachList/UnstructuredList/EachListItemWithAlloc (0.01s) === RUN TestExtractList === RUN TestExtractList/StructReceiverList === RUN TestExtractList/StructReceiverList/ExtractList @@ -1304,21 +1341,21 @@ === RUN TestExtractList/UnstructuredList === RUN TestExtractList/UnstructuredList/ExtractList === RUN TestExtractList/UnstructuredList/ExtractListWithAlloc ---- PASS: TestExtractList (0.48s) - --- PASS: TestExtractList/StructReceiverList (0.15s) - --- PASS: TestExtractList/StructReceiverList/ExtractList (0.04s) - --- PASS: TestExtractList/StructReceiverList/ExtractListWithAlloc (0.11s) - --- PASS: TestExtractList/PointerReceiverList (0.08s) - --- PASS: TestExtractList/PointerReceiverList/ExtractList (0.03s) - --- PASS: TestExtractList/PointerReceiverList/ExtractListWithAlloc (0.05s) - --- PASS: TestExtractList/RawExtensionList (0.09s) - --- PASS: TestExtractList/RawExtensionList/ExtractList (0.03s) - --- PASS: TestExtractList/RawExtensionList/ExtractListWithAlloc (0.06s) - --- PASS: TestExtractList/UnstructuredList (0.12s) - --- PASS: TestExtractList/UnstructuredList/ExtractList (0.07s) - --- PASS: TestExtractList/UnstructuredList/ExtractListWithAlloc (0.05s) +--- PASS: TestExtractList (0.12s) + --- PASS: TestExtractList/StructReceiverList (0.04s) + --- PASS: TestExtractList/StructReceiverList/ExtractList (0.02s) + --- PASS: TestExtractList/StructReceiverList/ExtractListWithAlloc (0.01s) + --- PASS: TestExtractList/PointerReceiverList (0.02s) + --- PASS: TestExtractList/PointerReceiverList/ExtractList (0.01s) + --- PASS: TestExtractList/PointerReceiverList/ExtractListWithAlloc (0.01s) + --- PASS: TestExtractList/RawExtensionList (0.02s) + --- PASS: TestExtractList/RawExtensionList/ExtractList (0.01s) + --- PASS: TestExtractList/RawExtensionList/ExtractListWithAlloc (0.01s) + --- PASS: TestExtractList/UnstructuredList (0.04s) + --- PASS: TestExtractList/UnstructuredList/ExtractList (0.02s) + --- PASS: TestExtractList/UnstructuredList/ExtractListWithAlloc (0.01s) === RUN TestAsPartialObjectMetadata ---- PASS: TestAsPartialObjectMetadata (0.39s) +--- PASS: TestAsPartialObjectMetadata (0.12s) === RUN TestMultiRESTMapperResourceFor --- PASS: TestMultiRESTMapperResourceFor (0.00s) === RUN TestMultiRESTMapperResourcesFor @@ -1330,7 +1367,7 @@ === RUN TestMultiRESTMapperRESTMappings --- PASS: TestMultiRESTMapperRESTMappings (0.00s) === RUN TestPriorityRESTMapperResourceForErrorHandling ---- PASS: TestPriorityRESTMapperResourceForErrorHandling (0.01s) +--- PASS: TestPriorityRESTMapperResourceForErrorHandling (0.00s) === RUN TestPriorityRESTMapperKindForErrorHandling --- PASS: TestPriorityRESTMapperKindForErrorHandling (0.00s) === RUN TestPriorityRESTMapperRESTMapping @@ -1342,7 +1379,7 @@ === RUN TestRESTMapperGroupForResource --- PASS: TestRESTMapperGroupForResource (0.00s) === RUN TestRESTMapperKindsFor ---- PASS: TestRESTMapperKindsFor (0.01s) +--- PASS: TestRESTMapperKindsFor (0.00s) === RUN TestRESTMapperResourcesFor --- PASS: TestRESTMapperResourcesFor (0.00s) === RUN TestKindToResource @@ -1358,8 +1395,7 @@ === RUN TestRESTMapperReportsErrorOnBadVersion --- PASS: TestRESTMapperReportsErrorOnBadVersion (0.00s) PASS -ok k8s.io/apimachinery/pkg/api/meta 1.572s -? k8s.io/apimachinery/pkg/api/meta/table [no test files] +ok k8s.io/apimachinery/pkg/api/meta 0.394s ? k8s.io/apimachinery/pkg/api/meta/testrestmapper [no test files] === RUN TestInt64AmountAsInt64 --- PASS: TestInt64AmountAsInt64 (0.00s) @@ -1380,7 +1416,7 @@ === RUN TestInt64AmountAsScaledInt64/test_when_i.scale_<_0_and_fraction_doesn't_exist === RUN TestInt64AmountAsScaledInt64/test_when_i.value_<_0_and_fraction_exists === RUN TestInt64AmountAsScaledInt64/test_when_i.value_<_0_and_fraction_doesn't_exists ---- PASS: TestInt64AmountAsScaledInt64 (0.01s) +--- PASS: TestInt64AmountAsScaledInt64 (0.00s) --- PASS: TestInt64AmountAsScaledInt64/test_when_i.scale_<_scaled_ (0.00s) --- PASS: TestInt64AmountAsScaledInt64/test_when_i.scale_=_scaled (0.00s) --- PASS: TestInt64AmountAsScaledInt64/test_when_i.scale_>_scaled_and_result_doesn't_overflow (0.00s) @@ -1422,7 +1458,7 @@ === RUN TestParseQuantityString --- PASS: TestParseQuantityString (0.00s) === RUN TestQuantityParse ---- PASS: TestQuantityParse (0.06s) +--- PASS: TestQuantityParse (0.00s) === RUN TestQuantityRoundUp --- PASS: TestQuantityRoundUp (0.00s) === RUN TestQuantityCmpInt64AndDec @@ -1430,13 +1466,13 @@ === RUN TestQuantityNeg --- PASS: TestQuantityNeg (0.00s) === RUN TestQuantityString ---- PASS: TestQuantityString (0.01s) +--- PASS: TestQuantityString (0.00s) === RUN TestQuantityParseEmit --- PASS: TestQuantityParseEmit (0.00s) === RUN TestQuantityDeepCopy --- PASS: TestQuantityDeepCopy (0.00s) === RUN TestJSON ---- PASS: TestJSON (0.14s) +--- PASS: TestJSON (0.03s) === RUN TestJSONWhitespace --- PASS: TestJSONWhitespace (0.00s) === RUN TestMilliNewSet @@ -1460,11 +1496,11 @@ === RUN TestMul --- PASS: TestMul (0.00s) === RUN TestAddSubRoundTrip ---- PASS: TestAddSubRoundTrip (0.02s) +--- PASS: TestAddSubRoundTrip (0.01s) === RUN TestAddSubRoundTripAcrossScales --- PASS: TestAddSubRoundTripAcrossScales (0.00s) === RUN TestNegateRoundTrip ---- PASS: TestNegateRoundTrip (0.03s) +--- PASS: TestNegateRoundTrip (0.01s) === RUN TestQuantityAsApproximateFloat64 === RUN TestQuantityAsApproximateFloat64/DecimalSI_0 === RUN TestQuantityAsApproximateFloat64/DecimalExponent_0 @@ -1501,7 +1537,7 @@ === RUN TestQuantityAsApproximateFloat64/DecimalSI_12E === RUN TestQuantityAsApproximateFloat64/DecimalSI_1200 === RUN TestQuantityAsApproximateFloat64/DecimalSI_-1200 ---- PASS: TestQuantityAsApproximateFloat64 (0.04s) +--- PASS: TestQuantityAsApproximateFloat64 (0.01s) --- PASS: TestQuantityAsApproximateFloat64/DecimalSI_0 (0.00s) --- PASS: TestQuantityAsApproximateFloat64/DecimalExponent_0 (0.00s) --- PASS: TestQuantityAsApproximateFloat64/BinarySI_0 (0.00s) @@ -1558,7 +1594,8 @@ === RUN ExampleMustParse --- PASS: ExampleMustParse (0.00s) PASS -ok k8s.io/apimachinery/pkg/api/resource 0.515s +ok k8s.io/apimachinery/pkg/api/resource 0.106s +? k8s.io/apimachinery/pkg/apis/meta/fuzzer [no test files] === RUN TestMaskTrailingDash --- PASS: TestMaskTrailingDash (0.00s) === RUN TestValidateObjectMetaCustomName @@ -1568,7 +1605,7 @@ === RUN TestValidateObjectMetaOwnerReferences --- PASS: TestValidateObjectMetaOwnerReferences (0.00s) === RUN TestValidateObjectMetaUpdateIgnoresCreationTimestamp ---- PASS: TestValidateObjectMetaUpdateIgnoresCreationTimestamp (0.01s) +--- PASS: TestValidateObjectMetaUpdateIgnoresCreationTimestamp (0.00s) === RUN TestValidateFinalizersUpdate --- PASS: TestValidateFinalizersUpdate (0.00s) === RUN TestValidateFinalizersPreventConflictingFinalizers @@ -1580,16 +1617,15 @@ === RUN TestValidateObjectMetaTrimsTrailingSlash --- PASS: TestValidateObjectMetaTrimsTrailingSlash (0.00s) === RUN TestValidateAnnotations ---- PASS: TestValidateAnnotations (0.02s) +--- PASS: TestValidateAnnotations (0.00s) PASS -ok k8s.io/apimachinery/pkg/api/validation 0.209s +ok k8s.io/apimachinery/pkg/api/validation 0.043s === RUN TestValidatePathSegmentName --- PASS: TestValidatePathSegmentName (0.00s) === RUN TestValidateWithMultiErrors --- PASS: TestValidateWithMultiErrors (0.00s) PASS -ok k8s.io/apimachinery/pkg/api/validation/path 0.058s -? k8s.io/apimachinery/pkg/apis/meta/fuzzer [no test files] +ok k8s.io/apimachinery/pkg/api/validation/path 0.034s === RUN TestSetListOptionsDefaults === RUN TestSetListOptionsDefaults/no-op,_RV_doesn't_match === RUN TestSetListOptionsDefaults/no-op,_SendInitialEvents_set @@ -1601,33 +1637,112 @@ === RUN TestSetListOptionsDefaults/no-op,_match_on_empty_RV_but_SendInitialEvents_is_on === RUN TestSetListOptionsDefaults/no-op,_match_on_empty_RV_but_SendInitialEvents_is_off === RUN TestSetListOptionsDefaults/no-op,_match_on_empty_RV_but_ResourceVersionMatch_set ---- PASS: TestSetListOptionsDefaults (0.01s) +--- PASS: TestSetListOptionsDefaults (0.00s) --- PASS: TestSetListOptionsDefaults/no-op,_RV_doesn't_match (0.00s) --- PASS: TestSetListOptionsDefaults/no-op,_SendInitialEvents_set (0.00s) --- PASS: TestSetListOptionsDefaults/no-op,_ResourceVersionMatch_set (0.00s) --- PASS: TestSetListOptionsDefaults/no-op,_Watch=false (0.00s) --- PASS: TestSetListOptionsDefaults/defaults_applied,_match_on_empty_RV (0.00s) --- PASS: TestSetListOptionsDefaults/defaults_applied,_match_on_RV=0 (0.00s) - --- PASS: TestSetListOptionsDefaults/no-op,_match_on_empty_RV_but_watch-list_fg_is_off (0.01s) + --- PASS: TestSetListOptionsDefaults/no-op,_match_on_empty_RV_but_watch-list_fg_is_off (0.00s) --- PASS: TestSetListOptionsDefaults/no-op,_match_on_empty_RV_but_SendInitialEvents_is_on (0.00s) --- 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.272s +ok k8s.io/apimachinery/pkg/apis/meta/internalversion 0.033s === RUN TestListOptions --- PASS: TestListOptions (0.00s) === RUN TestRoundTrip roundtrip.go:135: starting group "" roundtrip.go:148: finished group "" roundtrip.go:135: starting group "meta.k8s.io" + roundtrip.go:254: round tripping to meta.k8s.io/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=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=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=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=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=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=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=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=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=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=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=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=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=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/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/v1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions + roundtrip.go:254: round tripping to meta.k8s.io/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/v1, Kind=TableOptions v1.TableOptions roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table @@ -1635,7 +1750,9 @@ roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=Table v1.Table roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=Table v1.Table 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 @@ -1644,14 +1761,13 @@ 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/v1beta1, Kind=Table v1.Table @@ -1660,148 +1776,29 @@ 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=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/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList - roundtrip.go:254: round tripping to meta.k8s.io/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/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/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/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/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=TableOptions v1.TableOptions - roundtrip.go:254: round tripping to meta.k8s.io/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=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=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=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=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=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=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=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=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=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=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=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=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=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=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/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/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 @@ -1812,18 +1809,57 @@ roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata - roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadata v1.PartialObjectMetadata roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadata v1.PartialObjectMetadata roundtrip.go:254: round tripping to meta.k8s.io/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=PartialObjectMetadataList v1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1, Kind=PartialObjectMetadataList v1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/v1beta1, Kind=PartialObjectMetadataList v1beta1.PartialObjectMetadataList + roundtrip.go:254: round tripping to meta.k8s.io/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:148: finished group "meta.k8s.io" ---- PASS: TestRoundTrip (0.88s) +--- PASS: TestRoundTrip (0.22s) PASS -ok k8s.io/apimachinery/pkg/apis/meta/internalversion/scheme 1.069s +ok k8s.io/apimachinery/pkg/apis/meta/internalversion/scheme 0.273s === RUN TestValidateListOptions === RUN TestValidateListOptions/valid-default === RUN TestValidateListOptions/valid-resourceversionmatch-exact @@ -1843,7 +1879,7 @@ === RUN TestValidateListOptions/watch-sendInitialEvents-no-allowWatchBookmark === RUN TestValidateListOptions/watch-sendInitialEvents-no-watchlist-fg-disabled === RUN TestValidateListOptions/watch-sendInitialEvents-no-watchlist-fg-disabled#01 ---- PASS: TestValidateListOptions (0.01s) +--- PASS: TestValidateListOptions (0.00s) --- PASS: TestValidateListOptions/valid-default (0.00s) --- PASS: TestValidateListOptions/valid-resourceversionmatch-exact (0.00s) --- PASS: TestValidateListOptions/invalid-resourceversionmatch-exact (0.00s) @@ -1863,7 +1899,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.180s +ok k8s.io/apimachinery/pkg/apis/meta/internalversion/validation 0.013s === RUN TestNewControllerRef --- PASS: TestNewControllerRef (0.00s) === RUN TestGetControllerOf @@ -1873,7 +1909,7 @@ === RUN TestDurationMarshalYAML --- PASS: TestDurationMarshalYAML (0.00s) === RUN TestDurationUnmarshalYAML ---- PASS: TestDurationUnmarshalYAML (0.01s) +--- PASS: TestDurationUnmarshalYAML (0.00s) === RUN TestDurationMarshalJSON --- PASS: TestDurationMarshalJSON (0.00s) === RUN TestDurationUnmarshalJSON @@ -1889,7 +1925,7 @@ === RUN TestLabelSelectorAsMap --- PASS: TestLabelSelectorAsMap (0.00s) === RUN TestResetObjectMetaForStatus ---- PASS: TestResetObjectMetaForStatus (0.01s) +--- PASS: TestResetObjectMetaForStatus (0.00s) === RUN TestSetMetaDataLabel --- PASS: TestSetMetaDataLabel (0.00s) === RUN TestCloneSelectorAndAddLabel @@ -1897,7 +1933,7 @@ === RUN TestAddLabelToSelector --- PASS: TestAddLabelToSelector (0.00s) === RUN TestMicroTimeMarshalYAML ---- PASS: TestMicroTimeMarshalYAML (0.01s) +--- PASS: TestMicroTimeMarshalYAML (0.00s) === RUN TestMicroTimeUnmarshalYAML --- PASS: TestMicroTimeUnmarshalYAML (0.00s) === RUN TestMicroTimeMarshalJSON @@ -1949,7 +1985,7 @@ === RUN TestMicroTimeIsZero === RUN TestMicroTimeIsZero/nil_=?_0 === RUN TestMicroTimeIsZero/!nil_=?_0 ---- PASS: TestMicroTimeIsZero (0.01s) +--- PASS: TestMicroTimeIsZero (0.00s) --- PASS: TestMicroTimeIsZero/nil_=?_0 (0.00s) --- PASS: TestMicroTimeIsZero/!nil_=?_0 (0.00s) === RUN TestMicroTimeUnmarshalJSONAndProtoEqual @@ -2965,17 +3001,17 @@ === RUN TestPatchOptionsIsSuperSetOfUpdateOptions/Run_997/1000 === RUN TestPatchOptionsIsSuperSetOfUpdateOptions/Run_998/1000 === RUN TestPatchOptionsIsSuperSetOfUpdateOptions/Run_999/1000 ---- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions (2.09s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_0/1000 (0.01s) +--- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions (0.74s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_0/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_1/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_2/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_2/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_3/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_4/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_5/1000 (0.01s) + --- 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_9/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_9/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_10/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_11/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_12/1000 (0.00s) @@ -2989,7 +3025,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_20/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_21/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_22/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_23/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_23/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_24/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_25/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_26/1000 (0.00s) @@ -3000,11 +3036,11 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_31/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_32/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_33/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_34/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_34/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_35/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_36/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_37/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_38/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_38/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_39/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_40/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_41/1000 (0.00s) @@ -3017,13 +3053,13 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_48/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_49/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_50/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_51/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_51/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_52/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_53/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_54/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_54/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_55/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_56/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_57/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_57/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_58/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_59/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_60/1000 (0.00s) @@ -3032,19 +3068,19 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_63/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_64/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_65/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_66/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_66/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_67/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_68/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_69/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_70/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_70/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_71/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_72/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_72/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_73/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_74/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_75/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_76/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_77/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_78/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_78/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_79/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_80/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_81/1000 (0.00s) @@ -3056,17 +3092,17 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_87/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_88/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_89/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_90/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_90/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_91/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_92/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_93/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_93/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_94/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_95/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_96/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_96/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_97/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_98/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_99/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_100/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_100/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_101/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_102/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_103/1000 (0.00s) @@ -3075,7 +3111,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_106/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_107/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_108/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_109/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_109/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_110/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_111/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_112/1000 (0.00s) @@ -3084,7 +3120,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_115/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_116/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_117/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_118/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_118/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_119/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_120/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_121/1000 (0.00s) @@ -3095,27 +3131,27 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_126/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_127/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_128/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_129/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_129/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_130/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_131/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_132/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_132/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_133/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_134/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_135/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_135/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_136/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_137/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_138/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_139/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_140/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_141/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_142/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_142/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_143/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_144/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_145/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_146/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_147/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_148/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_149/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_149/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_150/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_151/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_152/1000 (0.00s) @@ -3123,7 +3159,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_154/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_155/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_156/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_157/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_157/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_158/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_159/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_160/1000 (0.00s) @@ -3137,20 +3173,20 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_168/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_169/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_170/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_171/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_171/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_172/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_173/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_174/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_174/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_175/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_176/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_177/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_177/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_178/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_179/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_180/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_180/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_181/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_182/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_183/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_184/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_184/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_185/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_186/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_187/1000 (0.00s) @@ -3158,11 +3194,11 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_189/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_190/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_191/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_192/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_192/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_193/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_194/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_195/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_196/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_196/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_197/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_198/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_199/1000 (0.00s) @@ -3171,7 +3207,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_202/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_203/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_204/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_205/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_205/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_206/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_207/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_208/1000 (0.00s) @@ -3181,9 +3217,9 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_212/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_213/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_214/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_215/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_215/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_216/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_217/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_217/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_218/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_219/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_220/1000 (0.00s) @@ -3303,7 +3339,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_334/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_335/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_336/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_337/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_337/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_338/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_339/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_340/1000 (0.00s) @@ -3311,7 +3347,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_342/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_343/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_344/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_345/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_345/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_346/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_347/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_348/1000 (0.00s) @@ -3319,14 +3355,14 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_350/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_351/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_352/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_353/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_353/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_354/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_355/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_356/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_357/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_358/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_359/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_360/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_360/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_361/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_362/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_363/1000 (0.00s) @@ -3335,7 +3371,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_366/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_367/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_368/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_369/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_369/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_370/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_371/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_372/1000 (0.00s) @@ -3343,13 +3379,13 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_374/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_375/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_376/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_377/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_377/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_378/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_379/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_380/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_381/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_381/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_382/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_383/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_383/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_384/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_385/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_386/1000 (0.00s) @@ -3367,10 +3403,10 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_398/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_399/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_400/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_401/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_401/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_402/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_403/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_404/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_404/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_405/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_406/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_407/1000 (0.00s) @@ -3379,14 +3415,14 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_410/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_411/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_412/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_413/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_413/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_414/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_415/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_416/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_416/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_417/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_418/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_419/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_420/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_420/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_421/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_422/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_423/1000 (0.00s) @@ -3395,7 +3431,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_426/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_427/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_428/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_429/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_429/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_430/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_431/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_432/1000 (0.00s) @@ -3419,14 +3455,14 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_450/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_451/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_452/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_453/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_453/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_454/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_455/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_456/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_457/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_458/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_459/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_460/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_460/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_461/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_462/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_463/1000 (0.00s) @@ -3442,21 +3478,21 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_473/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_474/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_475/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_476/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_477/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_476/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_477/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_478/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_479/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_480/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_480/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_481/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_482/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_483/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_484/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_484/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_485/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_486/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_487/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_487/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_488/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_489/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_490/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_490/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_491/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_492/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_493/1000 (0.00s) @@ -3476,7 +3512,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_507/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_508/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_509/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_510/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_510/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_511/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_512/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_513/1000 (0.00s) @@ -3484,7 +3520,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_515/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_516/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_517/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_518/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_518/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_519/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_520/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_521/1000 (0.00s) @@ -3503,7 +3539,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_534/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_535/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_536/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_537/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_537/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_538/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_539/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_540/1000 (0.00s) @@ -3514,42 +3550,42 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_545/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_546/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_547/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_548/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_548/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_549/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_550/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_551/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_551/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_552/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_553/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_554/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_554/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_555/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_556/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_557/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_558/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_559/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_560/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_560/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_561/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_562/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_563/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_563/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_564/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_565/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_566/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_567/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_567/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_568/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_569/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_570/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_571/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_571/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_572/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_573/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_574/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_574/1000 (0.00s) --- 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_579/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_580/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_580/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_581/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_582/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_583/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_583/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_584/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_585/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_586/1000 (0.00s) @@ -3567,8 +3603,8 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_598/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_599/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_600/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_601/1000 (0.01s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_602/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_601/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_602/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_603/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_604/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_605/1000 (0.00s) @@ -3577,11 +3613,11 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_608/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_609/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_610/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_611/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_611/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_612/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_613/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_614/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_615/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_615/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_616/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_617/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_618/1000 (0.00s) @@ -3610,7 +3646,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_641/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_642/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_643/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_644/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_644/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_645/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_646/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_647/1000 (0.00s) @@ -3635,12 +3671,12 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_666/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_667/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_668/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_669/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_669/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_670/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_671/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_672/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_673/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_674/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_674/1000 (0.03s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_675/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_676/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_677/1000 (0.00s) @@ -3657,7 +3693,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_688/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_689/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_690/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_691/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_691/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_692/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_693/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_694/1000 (0.00s) @@ -3679,7 +3715,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_710/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_711/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_712/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_713/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_713/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_714/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_715/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_716/1000 (0.00s) @@ -3692,10 +3728,10 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_723/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_724/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_725/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_726/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_726/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_727/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_728/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_729/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_729/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_730/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_731/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_732/1000 (0.00s) @@ -3712,14 +3748,14 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_743/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_744/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_745/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_746/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_746/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_747/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_748/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_749/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_750/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_751/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_751/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_752/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_753/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_753/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_754/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_755/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_756/1000 (0.00s) @@ -3735,23 +3771,23 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_766/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_767/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_768/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_769/1000 (0.01s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_770/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_769/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_770/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_771/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_772/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_773/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_774/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_775/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_775/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_776/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_777/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_778/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_779/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_779/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_780/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_781/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_781/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_782/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_783/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_784/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_785/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_785/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_786/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_787/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_788/1000 (0.00s) @@ -3768,14 +3804,14 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_799/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_800/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_801/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_802/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_802/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_803/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_804/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_805/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_806/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_807/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_808/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_809/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_809/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_810/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_811/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_812/1000 (0.00s) @@ -3789,7 +3825,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_820/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_821/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_822/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_823/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_823/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_824/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_825/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_826/1000 (0.00s) @@ -3799,39 +3835,39 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_830/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_831/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_832/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_833/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_833/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_834/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_835/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_836/1000 (0.01s) + --- 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.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_839/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_840/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_841/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_842/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_843/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_843/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_844/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_845/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_846/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_846/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_847/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_848/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_849/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_850/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_851/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_852/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_852/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_853/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_854/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_855/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_855/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_856/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_857/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_858/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_859/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_860/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_860/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_861/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_862/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_863/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_864/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_865/1000 (0.01s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_865/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_866/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_867/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_868/1000 (0.00s) @@ -3839,7 +3875,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_870/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_871/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_872/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_873/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_873/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_874/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_875/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_876/1000 (0.00s) @@ -3848,7 +3884,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_879/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_880/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_881/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_882/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_882/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_883/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_884/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_885/1000 (0.00s) @@ -3879,7 +3915,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_910/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_911/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_912/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_913/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_913/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_914/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_915/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_916/1000 (0.00s) @@ -3900,7 +3936,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_931/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_932/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_933/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_934/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_934/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_935/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_936/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_937/1000 (0.00s) @@ -3940,7 +3976,7 @@ --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_971/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_972/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_973/1000 (0.00s) - --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_974/1000 (0.00s) + --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_974/1000 (0.01s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_975/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_976/1000 (0.00s) --- PASS: TestPatchOptionsIsSuperSetOfUpdateOptions/Run_977/1000 (0.00s) @@ -4021,9 +4057,10 @@ === RUN TestConvertSliceStringToPointerTime --- PASS: TestConvertSliceStringToPointerTime (0.00s) PASS -ok k8s.io/apimachinery/pkg/apis/meta/v1 2.347s +ok k8s.io/apimachinery/pkg/apis/meta/v1 0.834s +? k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructuredscheme [no test files] === RUN TestCodecOfUnstructuredList ---- PASS: TestCodecOfUnstructuredList (0.02s) +--- PASS: TestCodecOfUnstructuredList (0.00s) === RUN TestRemoveNestedField --- PASS: TestRemoveNestedField (0.00s) === RUN TestNestedFieldNoCopy @@ -4059,9 +4096,9 @@ === RUN TestObjectToUnstructuredConversion/convert_versioned_empty_object_to_unstructured_should_work === RUN TestObjectToUnstructuredConversion/convert_valid_versioned_object_to_unstructured_should_work === RUN TestObjectToUnstructuredConversion/convert_hub-versioned_object_to_unstructured_should_fail ---- PASS: TestObjectToUnstructuredConversion (0.02s) +--- PASS: TestObjectToUnstructuredConversion (0.00s) --- PASS: TestObjectToUnstructuredConversion/convert_nil_object_to_unstructured_should_fail (0.00s) - --- PASS: TestObjectToUnstructuredConversion/convert_versioned_empty_object_to_unstructured_should_work (0.01s) + --- PASS: TestObjectToUnstructuredConversion/convert_versioned_empty_object_to_unstructured_should_work (0.00s) --- PASS: TestObjectToUnstructuredConversion/convert_valid_versioned_object_to_unstructured_should_work (0.00s) --- PASS: TestObjectToUnstructuredConversion/convert_hub-versioned_object_to_unstructured_should_fail (0.00s) === RUN TestUnstructuredToObjectConversion @@ -4072,7 +4109,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.01s) +--- PASS: TestUnstructuredToObjectConversion (0.00s) --- 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) @@ -4089,9 +4126,9 @@ === RUN TestUnstructuredToGVConversion/convert_valid_versioned_unstructured_to_its_own_version_should_work === RUN TestUnstructuredToGVConversion/convert_valid_versioned_unstructured_to_hub-version_should_work_ignoring_type_meta === RUN TestUnstructuredToGVConversion/convert_valid_versioned_unstructured_to_unexisting_version_should_fail ---- PASS: TestUnstructuredToGVConversion (0.01s) +--- PASS: TestUnstructuredToGVConversion (0.00s) --- PASS: TestUnstructuredToGVConversion/convert_versioned_unstructured_to_valid_external_version_should_work (0.00s) - --- PASS: TestUnstructuredToGVConversion/convert_hub-versioned_unstructured_to_hub_version_should_work (0.01s) + --- PASS: TestUnstructuredToGVConversion/convert_hub-versioned_unstructured_to_hub_version_should_work (0.00s) --- PASS: TestUnstructuredToGVConversion/convert_empty_unstructured_w/o_gvk_to_versioned_should_fail (0.00s) --- PASS: TestUnstructuredToGVConversion/convert_versioned_unstructured_to_mismatching_external_version_should_fail (0.00s) --- PASS: TestUnstructuredToGVConversion/convert_versioned_unstructured_to_mismatching_internal_version_should_fail (0.00s) @@ -4103,14 +4140,14 @@ === RUN TestNilUnstructuredContent --- PASS: TestNilUnstructuredContent (0.00s) === RUN TestUnstructuredMetadataRoundTrip ---- PASS: TestUnstructuredMetadataRoundTrip (2.49s) +--- PASS: TestUnstructuredMetadataRoundTrip (0.80s) === RUN TestUnstructuredMetadataOmitempty --- PASS: TestUnstructuredMetadataOmitempty (0.00s) PASS -ok k8s.io/apimachinery/pkg/apis/meta/v1/unstructured 2.771s -? k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructuredscheme [no test files] +ok k8s.io/apimachinery/pkg/apis/meta/v1/unstructured 0.846s +? k8s.io/apimachinery/pkg/apis/meta/v1beta1 [no test files] === RUN TestValidateLabels ---- PASS: TestValidateLabels (0.01s) +--- PASS: TestValidateLabels (0.00s) === RUN TestValidDryRun === RUN TestValidDryRun/[] === RUN TestValidDryRun/[All] @@ -4126,23 +4163,23 @@ --- PASS: TestInvalidDryRun/[False] (0.00s) --- PASS: TestInvalidDryRun/[All_False] (0.00s) === RUN TestValidPatchOptions -=== RUN TestValidPatchOptions/{{_}_[]_0x24a5244_kubectl_} +=== RUN TestValidPatchOptions/{{_}_[]_0x28b9244_kubectl_} === RUN TestValidPatchOptions/{{_}_[]__kubectl_} === RUN TestValidPatchOptions/{{_}_[]___} === RUN TestValidPatchOptions/{{_}_[]__patcher_} --- PASS: TestValidPatchOptions (0.00s) - --- PASS: TestValidPatchOptions/{{_}_[]_0x24a5244_kubectl_} (0.00s) + --- PASS: TestValidPatchOptions/{{_}_[]_0x28b9244_kubectl_} (0.00s) --- PASS: TestValidPatchOptions/{{_}_[]__kubectl_} (0.00s) --- PASS: TestValidPatchOptions/{{_}_[]___} (0.00s) --- PASS: TestValidPatchOptions/{{_}_[]__patcher_} (0.00s) === RUN TestInvalidPatchOptions === RUN TestInvalidPatchOptions/{{_}_[]___} -=== RUN TestInvalidPatchOptions/{{_}_[]_0x24a5344__} -=== RUN TestInvalidPatchOptions/{{_}_[]_0x24a5345_kubectl_} ---- PASS: TestInvalidPatchOptions (0.02s) +=== RUN TestInvalidPatchOptions/{{_}_[]_0x28b9344__} +=== RUN TestInvalidPatchOptions/{{_}_[]_0x28b9345_kubectl_} +--- PASS: TestInvalidPatchOptions (0.00s) --- PASS: TestInvalidPatchOptions/{{_}_[]___} (0.00s) - --- PASS: TestInvalidPatchOptions/{{_}_[]_0x24a5344__} (0.00s) - --- PASS: TestInvalidPatchOptions/{{_}_[]_0x24a5345_kubectl_} (0.00s) + --- PASS: TestInvalidPatchOptions/{{_}_[]_0x28b9344__} (0.00s) + --- PASS: TestInvalidPatchOptions/{{_}_[]_0x28b9345_kubectl_} (0.00s) === RUN TestValidateFieldManagerValid === RUN TestValidateFieldManagerValid/filedManager === RUN TestValidateFieldManagerValid/你好 @@ -4163,7 +4200,7 @@ === RUN TestValidateManagedFieldsInvalid/v1.ManagedFieldsEntry{Manager:"",_Operation:"",_APIVersion:"v1",_Time:,_FieldsType:"FieldsV1",_FieldsV1:(*v1.FieldsV1)(nil),_Subresource:""} === RUN TestValidateManagedFieldsInvalid/v1.ManagedFieldsEntry{Manager:"field\nmanager",_Operation:"Update",_APIVersion:"v1",_Time:,_FieldsType:"FieldsV1",_FieldsV1:(*v1.FieldsV1)(nil),_Subresource:""} === RUN TestValidateManagedFieldsInvalid/v1.ManagedFieldsEntry{Manager:"",_Operation:"Apply",_APIVersion:"v1",_Time:,_FieldsType:"FieldsV1",_FieldsV1:(*v1.FieldsV1)(nil),_Subresource:"TooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLongTooLong"} ---- PASS: TestValidateManagedFieldsInvalid (0.02s) +--- PASS: TestValidateManagedFieldsInvalid (0.00s) --- PASS: TestValidateManagedFieldsInvalid/v1.ManagedFieldsEntry{Manager:"",_Operation:"Update",_APIVersion:"v1",_Time:,_FieldsType:"RandomVersion",_FieldsV1:(*v1.FieldsV1)(nil),_Subresource:""} (0.00s) --- PASS: TestValidateManagedFieldsInvalid/v1.ManagedFieldsEntry{Manager:"",_Operation:"RandomOperation",_APIVersion:"v1",_Time:,_FieldsType:"FieldsV1",_FieldsV1:(*v1.FieldsV1)(nil),_Subresource:""} (0.00s) --- PASS: TestValidateManagedFieldsInvalid/v1.ManagedFieldsEntry{Manager:"",_Operation:"",_APIVersion:"v1",_Time:,_FieldsType:"FieldsV1",_FieldsV1:(*v1.FieldsV1)(nil),_Subresource:""} (0.00s) @@ -4185,9 +4222,9 @@ === RUN TestValidateConditions/colon-allowed-in-reason === RUN TestValidateConditions/comma-allowed-in-reason === RUN TestValidateConditions/reason-does-not-end-in-delimiter ---- PASS: TestValidateConditions (0.02s) +--- PASS: TestValidateConditions (0.00s) --- PASS: TestValidateConditions/bunch-of-invalid-fields (0.00s) - --- PASS: TestValidateConditions/duplicates (0.01s) + --- PASS: TestValidateConditions/duplicates (0.00s) --- PASS: TestValidateConditions/colon-allowed-in-reason (0.00s) --- PASS: TestValidateConditions/comma-allowed-in-reason (0.00s) --- PASS: TestValidateConditions/reason-does-not-end-in-delimiter (0.00s) @@ -4202,11 +4239,11 @@ --- PASS: TestLabelSelectorMatchExpression/MatchExpression's_operator_isn't_valid (0.01s) --- PASS: TestLabelSelectorMatchExpression/MatchExpression's_value_name_isn't_valid (0.00s) PASS -ok k8s.io/apimachinery/pkg/apis/meta/v1/validation 0.325s -? k8s.io/apimachinery/pkg/apis/meta/v1beta1 [no test files] +ok k8s.io/apimachinery/pkg/apis/meta/v1/validation 0.042s ? 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 "" @@ -4256,10 +4293,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.59s) +--- PASS: TestRoundTrip (0.10s) PASS -ok k8s.io/apimachinery/pkg/apis/testapigroup/install 0.899s -? k8s.io/apimachinery/pkg/apis/testapigroup/v1 [no test files] +ok k8s.io/apimachinery/pkg/apis/testapigroup/install 0.131s === RUN TestConverter_byteSlice --- PASS: TestConverter_byteSlice (0.00s) === RUN TestConverter_MismatchedTypes @@ -4279,11 +4315,11 @@ === RUN TestEnforceNilPtr --- PASS: TestEnforceNilPtr (0.00s) PASS -ok k8s.io/apimachinery/pkg/conversion 0.064s +ok k8s.io/apimachinery/pkg/conversion 0.039s === RUN TestConvert ---- PASS: TestConvert (0.01s) +--- PASS: TestConvert (0.00s) PASS -ok k8s.io/apimachinery/pkg/conversion/queryparams 0.204s +ok k8s.io/apimachinery/pkg/conversion/queryparams 0.053s === RUN TestSetString --- PASS: TestSetString (0.00s) === RUN TestFieldHas @@ -4317,7 +4353,7 @@ === RUN TestTransform --- PASS: TestTransform (0.00s) PASS -ok k8s.io/apimachinery/pkg/fields 0.076s +ok k8s.io/apimachinery/pkg/fields 0.008s === RUN TestSetString --- PASS: TestSetString (0.00s) === RUN TestLabelHas @@ -4329,9 +4365,9 @@ === RUN TestLabelMerge --- PASS: TestLabelMerge (0.00s) === RUN TestLabelSelectorParse ---- PASS: TestLabelSelectorParse (0.00s) +--- PASS: TestLabelSelectorParse (0.01s) === RUN TestSelectorParse ---- PASS: TestSelectorParse (0.01s) +--- PASS: TestSelectorParse (0.00s) === RUN TestDeterministicParse --- PASS: TestDeterministicParse (0.00s) === RUN TestEverything @@ -4353,13 +4389,13 @@ === RUN TestParseOperator --- PASS: TestParseOperator (0.00s) === RUN TestRequirementConstructor ---- PASS: TestRequirementConstructor (0.02s) +--- PASS: TestRequirementConstructor (0.00s) === RUN TestToString ---- PASS: TestToString (0.00s) +--- PASS: TestToString (0.01s) === RUN TestRequirementSelectorMatching --- PASS: TestRequirementSelectorMatching (0.00s) === RUN TestSetSelectorParser ---- PASS: TestSetSelectorParser (0.01s) +--- PASS: TestSetSelectorParser (0.00s) === RUN TestAdd --- PASS: TestAdd (0.00s) === RUN TestSafeSort @@ -4388,7 +4424,7 @@ === RUN TestRequiresExactMatch/keyDoubleEqualOperatorExactMatch === RUN TestRequiresExactMatch/keyNotEqualOperatorExactMatch === RUN TestRequiresExactMatch/keyEqualOperatorExactMatchFirst ---- PASS: TestRequiresExactMatch (0.01s) +--- PASS: TestRequiresExactMatch (0.00s) --- PASS: TestRequiresExactMatch/keyInOperatorExactMatch (0.00s) --- PASS: TestRequiresExactMatch/keyInOperatorNotExactMatch (0.00s) --- PASS: TestRequiresExactMatch/keyInOperatorNotExactMatch#01 (0.00s) @@ -4403,33 +4439,33 @@ === RUN TestRequirementEqual/requirements_with_different_keys_should_not_be_equal === RUN TestRequirementEqual/requirements_with_different_operators_should_not_be_equal === RUN TestRequirementEqual/requirements_with_different_values_should_not_be_equal ---- PASS: TestRequirementEqual (0.02s) +--- PASS: TestRequirementEqual (0.01s) --- PASS: TestRequirementEqual/same_requirements_should_be_equal (0.00s) --- PASS: TestRequirementEqual/requirements_with_different_keys_should_not_be_equal (0.00s) - --- PASS: TestRequirementEqual/requirements_with_different_operators_should_not_be_equal (0.01s) + --- 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.181s +ok k8s.io/apimachinery/pkg/labels 0.067s === RUN TestAllocatorRandomInputs ---- PASS: TestAllocatorRandomInputs (0.06s) +--- PASS: TestAllocatorRandomInputs (0.02s) === RUN TestAllocatorNeverShrinks ---- PASS: TestAllocatorNeverShrinks (0.01s) +--- PASS: TestAllocatorNeverShrinks (0.00s) === RUN TestAllocatorZero ---- PASS: TestAllocatorZero (0.02s) +--- PASS: TestAllocatorZero (0.00s) === RUN TestPreferredVersionsAllGroups === RUN TestPreferredVersionsAllGroups/observedOnly === RUN TestPreferredVersionsAllGroups/specifiedOnly === RUN TestPreferredVersionsAllGroups/both ---- PASS: TestPreferredVersionsAllGroups (0.01s) +--- PASS: TestPreferredVersionsAllGroups (0.00s) --- PASS: TestPreferredVersionsAllGroups/observedOnly (0.00s) - --- PASS: TestPreferredVersionsAllGroups/specifiedOnly (0.01s) + --- PASS: TestPreferredVersionsAllGroups/specifiedOnly (0.00s) --- PASS: TestPreferredVersionsAllGroups/both (0.00s) === RUN TestResourceMapper === RUN TestResourceMapper/no_identityfunc === RUN TestResourceMapper/empty_identityfunc === RUN TestResourceMapper/common_identityfunc === RUN TestResourceMapper/colocated_deployments ---- PASS: TestResourceMapper (0.01s) +--- PASS: TestResourceMapper (0.00s) --- PASS: TestResourceMapper/no_identityfunc (0.00s) --- PASS: TestResourceMapper/empty_identityfunc (0.00s) --- PASS: TestResourceMapper/common_identityfunc (0.00s) @@ -4449,8 +4485,8 @@ === RUN TestCacheableObject/delegate_return_self === RUN TestCacheableObject/cached_success === RUN TestCacheableObject/cached_failure ---- PASS: TestCacheableObject (0.01s) - --- PASS: TestCacheableObject/delegate (0.01s) +--- PASS: TestCacheableObject (0.00s) + --- PASS: TestCacheableObject/delegate (0.00s) --- PASS: TestCacheableObject/delegate_return_self (0.00s) --- PASS: TestCacheableObject/cached_success (0.00s) --- PASS: TestCacheableObject/cached_failure (0.00s) @@ -4464,16 +4500,16 @@ === RUN TestRoundTrip/6 === RUN TestRoundTrip/7 === RUN TestRoundTrip/8 ---- PASS: TestRoundTrip (0.07s) +--- PASS: TestRoundTrip (0.03s) --- PASS: TestRoundTrip/0 (0.01s) - --- PASS: TestRoundTrip/1 (0.01s) + --- PASS: TestRoundTrip/1 (0.00s) --- PASS: TestRoundTrip/2 (0.00s) --- PASS: TestRoundTrip/3 (0.00s) --- PASS: TestRoundTrip/4 (0.01s) --- PASS: TestRoundTrip/5 (0.00s) - --- PASS: TestRoundTrip/6 (0.01s) + --- PASS: TestRoundTrip/6 (0.00s) --- PASS: TestRoundTrip/7 (0.00s) - --- PASS: TestRoundTrip/8 (0.01s) + --- PASS: TestRoundTrip/8 (0.00s) === RUN TestUnknownFields === RUN TestUnknownFields/0 === RUN TestUnknownFields/1 @@ -4483,14 +4519,14 @@ === RUN TestUnknownFields/5 === RUN TestUnknownFields/6 === RUN TestUnknownFields/7 ---- PASS: TestUnknownFields (0.05s) +--- PASS: TestUnknownFields (0.01s) --- PASS: TestUnknownFields/0 (0.00s) --- PASS: TestUnknownFields/1 (0.00s) - --- PASS: TestUnknownFields/2 (0.01s) + --- PASS: TestUnknownFields/2 (0.00s) --- PASS: TestUnknownFields/3 (0.00s) --- PASS: TestUnknownFields/4 (0.00s) --- PASS: TestUnknownFields/5 (0.01s) - --- PASS: TestUnknownFields/6 (0.02s) + --- PASS: TestUnknownFields/6 (0.00s) --- PASS: TestUnknownFields/7 (0.00s) === RUN TestUnrecognized === RUN TestUnrecognized/{"da":[3.5,4,"3.0",null]} @@ -4527,20 +4563,20 @@ === RUN TestUnrecognized/{"fi":"abc"} === RUN TestUnrecognized/{"fi":["abc"]} === RUN TestUnrecognized/{"fi":[true]} ---- PASS: TestUnrecognized (0.10s) +--- PASS: TestUnrecognized (0.01s) --- PASS: TestUnrecognized/{"da":[3.5,4,"3.0",null]} (0.00s) --- PASS: TestUnrecognized/{"ea":[3.5,4,"3.0",null]} (0.00s) --- PASS: TestUnrecognized/{"ea":[null,null,null]} (0.00s) --- PASS: TestUnrecognized/{"ea":[[],[null]]} (0.00s) --- PASS: TestUnrecognized/{"ea":{"a":[],"b":null}} (0.00s) - --- PASS: TestUnrecognized/{"fa":"fa","fb":{"a":"a"}} (0.01s) + --- PASS: TestUnrecognized/{"fa":"fa","fb":{"a":"a"}} (0.00s) --- PASS: TestUnrecognized/{"fa":"fa","fb":{"a":null}} (0.00s) --- PASS: TestUnrecognized/{"fc":[null]} (0.00s) --- PASS: TestUnrecognized/{"fc":[{"aa":123,"ab":"bbb"}]} (0.00s) - --- PASS: TestUnrecognized/{"fx":[{"aa":123,"ab":"bbb"}],"fz":123} (0.01s) + --- PASS: TestUnrecognized/{"fx":[{"aa":123,"ab":"bbb"}],"fz":123} (0.00s) --- PASS: TestUnrecognized/{"fc":[{"aa":"aaa","ab":"bbb"}]} (0.00s) --- PASS: TestUnrecognized/{"fd":123,"fe":3.5} (0.00s) - --- PASS: TestUnrecognized/{"ff":["abc"],"fg":[123],"fh":[true,false]} (0.01s) + --- PASS: TestUnrecognized/{"ff":["abc"],"fg":[123],"fh":[true,false]} (0.00s) --- PASS: TestUnrecognized/{"fj":""} (0.00s) --- PASS: TestUnrecognized/{"fa":123} (0.00s) --- PASS: TestUnrecognized/{"fa":13.5} (0.00s) @@ -4557,7 +4593,7 @@ --- PASS: TestUnrecognized/{"fh":"abc"} (0.00s) --- PASS: TestUnrecognized/{"fh":["abc"]} (0.00s) --- PASS: TestUnrecognized/{"fh":[3.5]} (0.00s) - --- PASS: TestUnrecognized/{"fh":[123]} (0.01s) + --- PASS: TestUnrecognized/{"fh":[123]} (0.00s) --- PASS: TestUnrecognized/{"fi":123} (0.00s) --- PASS: TestUnrecognized/{"fi":"abc"} (0.00s) --- PASS: TestUnrecognized/{"fi":["abc"]} (0.00s) @@ -4589,23 +4625,23 @@ === PAUSE TestCustomToUnstructured/0.0 === CONT TestCustomToUnstructured/null === CONT TestCustomToUnstructured/{} -=== CONT TestCustomToUnstructured/[] === CONT TestCustomToUnstructured/0.0 -=== CONT TestCustomToUnstructured/[1] -=== CONT TestCustomToUnstructured/false === CONT TestCustomToUnstructured/0 === CONT TestCustomToUnstructured/{"a":1} +=== CONT TestCustomToUnstructured/[] +=== CONT TestCustomToUnstructured/[1] +=== CONT TestCustomToUnstructured/false === CONT TestCustomToUnstructured/true ---- PASS: TestCustomToUnstructured (0.01s) - --- PASS: TestCustomToUnstructured/{} (0.02s) - --- PASS: TestCustomToUnstructured/[1] (0.00s) - --- PASS: TestCustomToUnstructured/false (0.00s) - --- PASS: TestCustomToUnstructured/null (0.02s) - --- PASS: TestCustomToUnstructured/[] (0.02s) - --- PASS: TestCustomToUnstructured/0.0 (0.02s) +--- PASS: TestCustomToUnstructured (0.00s) + --- PASS: TestCustomToUnstructured/{} (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/[1] (0.00s) + --- PASS: TestCustomToUnstructured/false (0.00s) --- PASS: TestCustomToUnstructured/true (0.00s) + --- PASS: TestCustomToUnstructured/null (0.00s) === RUN TestCustomToUnstructuredTopLevel === RUN TestCustomToUnstructuredTopLevel/0 === PAUSE TestCustomToUnstructuredTopLevel/0 @@ -4613,22 +4649,22 @@ === PAUSE TestCustomToUnstructuredTopLevel/1 === CONT TestCustomToUnstructuredTopLevel/0 === CONT TestCustomToUnstructuredTopLevel/1 ---- PASS: TestCustomToUnstructuredTopLevel (0.01s) +--- PASS: TestCustomToUnstructuredTopLevel (0.00s) --- PASS: TestCustomToUnstructuredTopLevel/0 (0.00s) --- PASS: TestCustomToUnstructuredTopLevel/1 (0.00s) === RUN TestDecodeEmptyRawExtensionAsObject ---- PASS: TestDecodeEmptyRawExtensionAsObject (0.01s) +--- PASS: TestDecodeEmptyRawExtensionAsObject (0.00s) === RUN TestArrayOfRuntimeObject embedded_test.go:105: Wire format is: {"apiVersion":"test.group/v1test","kind":"ObjectTest","items":[{"apiVersion":"test.group/v1test","kind":"EmbeddedTest","id":"foo","object":null,"emptyObject":null},{"apiVersion":"test.group/v1test","kind":"EmbeddedTest","id":"bar","object":null,"emptyObject":null},{"apiVersion":"unknown.group/unknown","foo":"bar","kind":"OtherTest"},{"apiVersion":"test.group/v1test","kind":"ObjectTest","items":[{"apiVersion":"test.group/v1test","kind":"EmbeddedTest","id":"baz","object":null,"emptyObject":null}]}]} embedded_test.go:111: exact wire is: {"apiVersion":"test.group/v1test","kind":"EmbeddedTest","id":"foo","object":null,"emptyObject":null} ---- PASS: TestArrayOfRuntimeObject (0.02s) +--- PASS: TestArrayOfRuntimeObject (0.00s) === RUN TestNestedObject embedded_test.go:171: Wire format is: {"apiVersion":"test.group/v1test","kind":"EmbeddedTest","id":"outer","object":{"apiVersion":"test.group/v1test","kind":"EmbeddedTest","id":"inner","object":null,"emptyObject":null},"emptyObject":null} ---- PASS: TestNestedObject (0.01s) +--- PASS: TestNestedObject (0.00s) === RUN TestDeepCopyOfRuntimeObject embedded_test.go:249: originalRole = {"apiVersion":"test.group/v1test","kind":"EmbeddedTest","id":"outer","object":{"ID":"inner","Object":null,"EmptyObject":null},"emptyObject":null} @@ -4636,7 +4672,7 @@ --- PASS: TestDeepCopyOfRuntimeObject (0.00s) === RUN TestEmbeddedRawExtensionMarshal ---- PASS: TestEmbeddedRawExtensionMarshal (0.01s) +--- PASS: TestEmbeddedRawExtensionMarshal (0.00s) === RUN TestEmbeddedRawExtensionUnmarshal --- PASS: TestEmbeddedRawExtensionUnmarshal (0.00s) === RUN TestEmbeddedRawExtensionRoundTrip @@ -4651,10 +4687,10 @@ === RUN TestScheme/Encode_and_Convert_should_each_have_caused_an_increment === RUN TestScheme/DecodeInto_and_Decode_should_each_have_caused_an_increment_because_of_a_conversion === RUN TestScheme/Verify_that_unstructured_types_must_have_V_and_K_set ---- PASS: TestScheme (0.02s) - --- PASS: TestScheme/Encode,_Decode,_DecodeInto,_and_DecodeToVersion (0.01s) +--- PASS: TestScheme (0.00s) + --- PASS: TestScheme/Encode,_Decode,_DecodeInto,_and_DecodeToVersion (0.00s) --- PASS: TestScheme/Convert (0.00s) - --- PASS: TestScheme/Convert_internal_to_unstructured (0.01s) + --- PASS: TestScheme/Convert_internal_to_unstructured (0.00s) --- PASS: TestScheme/Convert_external_to_unstructured (0.00s) --- PASS: TestScheme/Convert_unstructured_to_unstructured (0.00s) --- PASS: TestScheme/Convert_unstructured_to_structured (0.00s) @@ -4662,11 +4698,11 @@ --- PASS: TestScheme/DecodeInto_and_Decode_should_each_have_caused_an_increment_because_of_a_conversion (0.00s) --- PASS: TestScheme/Verify_that_unstructured_types_must_have_V_and_K_set (0.00s) === RUN TestBadJSONRejection ---- PASS: TestBadJSONRejection (0.01s) +--- PASS: TestBadJSONRejection (0.00s) === RUN TestExternalToInternalMapping --- PASS: TestExternalToInternalMapping (0.00s) === RUN TestExtensionMapping ---- PASS: TestExtensionMapping (0.01s) +--- PASS: TestExtensionMapping (0.00s) === RUN TestEncode --- PASS: TestEncode (0.00s) === RUN TestUnversionedTypes @@ -4701,11 +4737,11 @@ === RUN TestConvertToVersion/18 === RUN TestConvertToVersion/19 === RUN TestConvertToVersion/20 ---- PASS: TestConvertToVersion (0.03s) +--- PASS: TestConvertToVersion (0.01s) --- PASS: TestConvertToVersion/0 (0.00s) --- PASS: TestConvertToVersion/1 (0.00s) --- PASS: TestConvertToVersion/2 (0.00s) - --- PASS: TestConvertToVersion/3 (0.01s) + --- PASS: TestConvertToVersion/3 (0.00s) --- PASS: TestConvertToVersion/4 (0.00s) --- PASS: TestConvertToVersion/5 (0.00s) --- PASS: TestConvertToVersion/6 (0.00s) @@ -4748,7 +4784,7 @@ --- PASS: TestSpliceBuffer/Write/Splice,_Reset,_Write/Splice (0.00s) --- PASS: TestSpliceBuffer/Write,_Reset,_Splice (0.00s) PASS -ok k8s.io/apimachinery/pkg/runtime 0.766s +ok k8s.io/apimachinery/pkg/runtime 0.147s === RUN TestGroupVersionParse --- PASS: TestGroupVersionParse (0.00s) === RUN TestGroupResourceParse @@ -4763,7 +4799,7 @@ === RUN TestParseKindArg/Pod. === RUN TestParseKindArg/StatefulSet.apps === RUN TestParseKindArg/StatefulSet.v1.apps ---- PASS: TestParseKindArg (0.01s) +--- PASS: TestParseKindArg (0.00s) --- PASS: TestParseKindArg/Pod (0.00s) --- PASS: TestParseKindArg/.apps (0.00s) --- PASS: TestParseKindArg/Pod. (0.00s) @@ -4782,21 +4818,21 @@ === RUN TestBestMatch --- PASS: TestBestMatch (0.00s) PASS -ok k8s.io/apimachinery/pkg/runtime/schema 0.056s +ok k8s.io/apimachinery/pkg/runtime/schema 0.045s === RUN TestTypes ---- PASS: TestTypes (3.22s) +--- PASS: TestTypes (0.73s) === RUN TestVersionedEncoding --- PASS: TestVersionedEncoding (0.00s) === RUN TestMultipleNames ---- PASS: TestMultipleNames (0.01s) +--- PASS: TestMultipleNames (0.00s) === RUN TestStrictOption ---- PASS: TestStrictOption (0.01s) +--- PASS: TestStrictOption (0.00s) === RUN TestConvertTypesWhenDefaultNamesMatch --- PASS: TestConvertTypesWhenDefaultNamesMatch (0.00s) === RUN TestEncode_Ptr ---- PASS: TestEncode_Ptr (0.01s) +--- PASS: TestEncode_Ptr (0.00s) === RUN TestBadJSONRejection ---- PASS: TestBadJSONRejection (0.01s) +--- PASS: TestBadJSONRejection (0.00s) === RUN TestDirectCodec --- PASS: TestDirectCodec (0.00s) === RUN TestSparse @@ -4804,13 +4840,13 @@ sparse_test.go:70: {"kind":"FakeV2DifferentObj","apiVersion":"mygroup/v2","name":"foo","creationTimestamp":null} ---- PASS: TestSparse (0.01s) +--- PASS: TestSparse (0.00s) PASS -ok k8s.io/apimachinery/pkg/runtime/serializer 3.456s +ok k8s.io/apimachinery/pkg/runtime/serializer 0.789s === RUN TestJSONLimits === RUN TestJSONLimits/3MB_of_deeply_nested_slices -=== RUN TestJSONLimits/3MB_of_deeply_nested_slices/utiljson === RUN TestJSONLimits/3MB_of_deeply_nested_slices/gojson +=== RUN TestJSONLimits/3MB_of_deeply_nested_slices/utiljson === RUN TestJSONLimits/3MB_of_unbalanced_nested_slices === RUN TestJSONLimits/3MB_of_unbalanced_nested_slices/gojson === RUN TestJSONLimits/3MB_of_unbalanced_nested_slices/utiljson @@ -4818,37 +4854,38 @@ === 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 (2.17s) - --- PASS: TestJSONLimits/3MB_of_deeply_nested_slices (0.02s) - --- PASS: TestJSONLimits/3MB_of_deeply_nested_slices/utiljson (0.01s) - --- PASS: TestJSONLimits/3MB_of_deeply_nested_slices/gojson (0.01s) +=== RUN TestJSONLimits/3MB_of_unbalanced_nested_maps/gojson +--- PASS: TestJSONLimits (0.52s) + --- 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.01s) --- PASS: TestJSONLimits/3MB_of_unbalanced_nested_slices/gojson (0.00s) --- PASS: TestJSONLimits/3MB_of_unbalanced_nested_slices/utiljson (0.01s) - --- PASS: TestJSONLimits/3MB_of_deeply_nested_maps (0.02s) - --- PASS: TestJSONLimits/3MB_of_deeply_nested_maps/gojson (0.01s) - --- PASS: TestJSONLimits/3MB_of_deeply_nested_maps/utiljson (0.01s) - --- PASS: TestJSONLimits/3MB_of_unbalanced_nested_maps (0.03s) - --- PASS: TestJSONLimits/3MB_of_unbalanced_nested_maps/gojson (0.01s) - --- PASS: TestJSONLimits/3MB_of_unbalanced_nested_maps/utiljson (0.01s) + --- PASS: TestJSONLimits/3MB_of_deeply_nested_maps (0.00s) + --- 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/utiljson (0.00s) + --- PASS: TestJSONLimits/3MB_of_unbalanced_nested_maps/gojson (0.00s) === RUN TestSimpleMetaFactoryInterpret --- PASS: TestSimpleMetaFactoryInterpret (0.00s) === RUN TestDecode ---- PASS: TestDecode (0.06s) +--- PASS: TestDecode (0.02s) === RUN TestCacheableObject === RUN TestCacheableObject/delegate === RUN TestCacheableObject/delegate_return_self === RUN TestCacheableObject/cached_success === RUN TestCacheableObject/cached_failure ---- PASS: TestCacheableObject (0.01s) +--- PASS: TestCacheableObject (0.00s) --- PASS: TestCacheableObject/delegate (0.00s) --- PASS: TestCacheableObject/delegate_return_self (0.00s) --- PASS: TestCacheableObject/cached_success (0.00s) --- PASS: TestCacheableObject/cached_failure (0.00s) PASS -ok k8s.io/apimachinery/pkg/runtime/serializer/json 2.496s +ok k8s.io/apimachinery/pkg/runtime/serializer/json 0.704s +? k8s.io/apimachinery/pkg/runtime/serializer/recognizer [no test files] === RUN TestCacheableObject === RUN TestCacheableObject/delegate === RUN TestCacheableObject/delegate_return_self @@ -4878,20 +4915,19 @@ --- PASS: TestRawSerializerEncodeWithAllocator (0.00s) --- PASS: TestRawSerializerEncodeWithAllocator/encode_a_bufferedReverseMarshaller_obj (0.00s) PASS -ok k8s.io/apimachinery/pkg/runtime/serializer/protobuf 0.080s -? k8s.io/apimachinery/pkg/runtime/serializer/recognizer [no test files] +ok k8s.io/apimachinery/pkg/runtime/serializer/protobuf 0.037s === 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.065s +ok k8s.io/apimachinery/pkg/runtime/serializer/recognizer/testing 0.017s === RUN TestEmptyDecoder --- PASS: TestEmptyDecoder (0.00s) === RUN TestDecoder ---- PASS: TestDecoder (0.80s) +--- PASS: TestDecoder (0.14s) PASS -ok k8s.io/apimachinery/pkg/runtime/serializer/streaming 0.904s +ok k8s.io/apimachinery/pkg/runtime/serializer/streaming 0.187s === RUN TestNestedDecode --- PASS: TestNestedDecode (0.00s) === RUN TestNestedDecodeStrictDecodingError @@ -4924,7 +4960,9 @@ === RUN TestDecodeUnstructured --- PASS: TestDecodeUnstructured (0.00s) PASS -ok k8s.io/apimachinery/pkg/runtime/serializer/versioning 0.135s +ok k8s.io/apimachinery/pkg/runtime/serializer/versioning 0.022s +? 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 @@ -4946,7 +4984,7 @@ === RUN TestInterpret/JSONSuccessfullyWrongFormat === RUN TestInterpret/JSONFailInterpretArray === RUN TestInterpret/JSONFailInterpretWrongSyntax ---- PASS: TestInterpret (0.03s) +--- PASS: TestInterpret (0.01s) --- PASS: TestInterpret/YAMLSuccessfullyInterpretVK (0.00s) --- PASS: TestInterpret/YAMLSuccessfullyInterpretGVK (0.00s) --- PASS: TestInterpret/YAMLSuccessfullyInterpretV (0.00s) @@ -4957,11 +4995,11 @@ --- PASS: TestInterpret/YAMLSuccessfullyInterpretOnlyG (0.00s) --- PASS: TestInterpret/YAMLSuccessfullyWrongFormat (0.00s) --- PASS: TestInterpret/YAMLFailInterpretWrongSyntax (0.00s) - --- PASS: TestInterpret/JSONSuccessfullyInterpretVK (0.01s) + --- PASS: TestInterpret/JSONSuccessfullyInterpretVK (0.00s) --- PASS: TestInterpret/JSONSuccessfullyInterpretGVK (0.00s) --- PASS: TestInterpret/JSONSuccessfullyInterpretV (0.00s) --- PASS: TestInterpret/JSONSuccessfullyInterpretK (0.00s) - --- PASS: TestInterpret/JSONSuccessfullyInterpretEmptyString (0.00s) + --- PASS: TestInterpret/JSONSuccessfullyInterpretEmptyString (0.01s) --- PASS: TestInterpret/JSONSuccessfullyInterpretEmptyObject (0.00s) --- PASS: TestInterpret/JSONSuccessfullyInterpretMultiDoc (0.00s) --- PASS: TestInterpret/JSONSuccessfullyWrongFormat (0.00s) @@ -4975,32 +5013,30 @@ === RUN TestYAMLLimits/deeply_nested_slices/sigsyaml === RUN TestYAMLLimits/deeply_nested_slices/utilyaml === RUN TestYAMLLimits/deeply_nested_maps -=== RUN TestYAMLLimits/deeply_nested_maps/sigsyaml === RUN TestYAMLLimits/deeply_nested_maps/utilyaml +=== RUN TestYAMLLimits/deeply_nested_maps/sigsyaml === RUN TestYAMLLimits/deeply_nested_indents === RUN TestYAMLLimits/deeply_nested_indents/sigsyaml === RUN TestYAMLLimits/deeply_nested_indents/utilyaml ---- PASS: TestYAMLLimits (2.99s) - --- PASS: TestYAMLLimits/arrays_of_string_aliases (0.08s) - --- PASS: TestYAMLLimits/arrays_of_string_aliases/sigsyaml (0.03s) - --- PASS: TestYAMLLimits/arrays_of_string_aliases/utilyaml (0.05s) - --- PASS: TestYAMLLimits/deeply_nested_slices (0.29s) - --- PASS: TestYAMLLimits/deeply_nested_slices/sigsyaml (0.16s) - --- PASS: TestYAMLLimits/deeply_nested_slices/utilyaml (0.12s) - --- PASS: TestYAMLLimits/deeply_nested_maps (0.39s) - --- PASS: TestYAMLLimits/deeply_nested_maps/sigsyaml (0.16s) - --- PASS: TestYAMLLimits/deeply_nested_maps/utilyaml (0.23s) - --- PASS: TestYAMLLimits/deeply_nested_indents (0.17s) - --- PASS: TestYAMLLimits/deeply_nested_indents/sigsyaml (0.09s) - --- PASS: TestYAMLLimits/deeply_nested_indents/utilyaml (0.08s) +--- PASS: TestYAMLLimits (0.73s) + --- PASS: TestYAMLLimits/arrays_of_string_aliases (0.02s) + --- PASS: TestYAMLLimits/arrays_of_string_aliases/sigsyaml (0.01s) + --- PASS: TestYAMLLimits/arrays_of_string_aliases/utilyaml (0.01s) + --- PASS: TestYAMLLimits/deeply_nested_slices (0.06s) + --- PASS: TestYAMLLimits/deeply_nested_slices/sigsyaml (0.03s) + --- PASS: TestYAMLLimits/deeply_nested_slices/utilyaml (0.03s) + --- PASS: TestYAMLLimits/deeply_nested_maps (0.12s) + --- PASS: TestYAMLLimits/deeply_nested_maps/utilyaml (0.06s) + --- PASS: TestYAMLLimits/deeply_nested_maps/sigsyaml (0.05s) + --- PASS: TestYAMLLimits/deeply_nested_indents (0.04s) + --- PASS: TestYAMLLimits/deeply_nested_indents/sigsyaml (0.02s) + --- PASS: TestYAMLLimits/deeply_nested_indents/utilyaml (0.02s) PASS -ok k8s.io/apimachinery/pkg/runtime/serializer/yaml 3.256s -? 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.781s ? k8s.io/apimachinery/pkg/types [no test files] ? k8s.io/apimachinery/pkg/util/diff [no test files] === RUN TestIsList ---- PASS: TestIsList (0.01s) +--- PASS: TestIsList (0.00s) === RUN TestExtractList --- PASS: TestExtractList (0.00s) === RUN TestEachListItem @@ -5014,7 +5050,7 @@ === RUN TestSetListToMatchingType --- PASS: TestSetListToMatchingType (0.00s) === RUN TestSetExtractListRoundTrip ---- PASS: TestSetExtractListRoundTrip (0.23s) +--- PASS: TestSetExtractListRoundTrip (0.13s) === RUN TestAPIObjectMeta --- PASS: TestAPIObjectMeta (0.00s) === RUN TestGenericTypeMeta @@ -5022,7 +5058,7 @@ === RUN TestResourceVersionerOfAPI --- PASS: TestResourceVersionerOfAPI (0.00s) === RUN TestAccessOwnerReferences ---- PASS: TestAccessOwnerReferences (0.06s) +--- PASS: TestAccessOwnerReferences (0.05s) === RUN TestDecodeUnstructured --- PASS: TestDecodeUnstructured (0.00s) === RUN TestDecode @@ -5030,7 +5066,7 @@ === RUN TestUnstructuredGetters --- PASS: TestUnstructuredGetters (0.00s) === RUN TestUnstructuredSetters ---- PASS: TestUnstructuredSetters (0.01s) +--- PASS: TestUnstructuredSetters (0.00s) === RUN TestOwnerReferences === PAUSE TestOwnerReferences === RUN TestUnstructuredListGetters @@ -5057,19 +5093,19 @@ apis_meta_v1_unstructed_unstructure_test.go:533: evaluating test 14 (OwnerReferences) --- PASS: TestAccessorMethods (0.00s) === RUN TestDecodeList ---- PASS: TestDecodeList (0.01s) +--- PASS: TestDecodeList (0.00s) === RUN TestRecognize --- PASS: TestRecognize (0.00s) === RUN TestEncode ---- PASS: TestEncode (0.00s) +--- PASS: TestEncode (0.02s) === RUN TestProtobufDecode --- PASS: TestProtobufDecode (0.00s) === RUN TestDecodeObjects --- PASS: TestDecodeObjects (0.00s) === RUN TestV1EncodeDecodeStatus ---- PASS: TestV1EncodeDecodeStatus (0.01s) +--- PASS: TestV1EncodeDecodeStatus (0.00s) === RUN TestExperimentalEncodeDecodeStatus ---- PASS: TestExperimentalEncodeDecodeStatus (0.01s) +--- PASS: TestExperimentalEncodeDecodeStatus (0.00s) === CONT TestOwnerReferences === RUN TestOwnerReferences/0 === PAUSE TestOwnerReferences/0 @@ -5085,7 +5121,7 @@ --- PASS: TestOwnerReferences/2 (0.00s) --- PASS: TestOwnerReferences/1 (0.00s) PASS -ok k8s.io/apimachinery/pkg/test 0.532s +ok k8s.io/apimachinery/pkg/test 0.340s === RUN TestExpiringCache --- PASS: TestExpiringCache (0.00s) === RUN TestExpiration @@ -5103,7 +5139,7 @@ --- PASS: TestGarbageCollection/three_entries_weird_order (0.00s) --- PASS: TestGarbageCollection/expire_multiple_entries_in_one_cycle (0.00s) === RUN TestStressExpiringCache ---- PASS: TestStressExpiringCache (5.12s) +--- PASS: TestStressExpiringCache (5.10s) === RUN TestSimpleGet --- PASS: TestSimpleGet (0.00s) === RUN TestSimpleRemove @@ -5115,13 +5151,13 @@ === RUN TestLRUOverflow --- PASS: TestLRUOverflow (0.00s) === RUN TestAddBringsToFront ---- PASS: TestAddBringsToFront (0.01s) +--- PASS: TestAddBringsToFront (0.00s) === RUN TestGetBringsToFront --- PASS: TestGetBringsToFront (0.00s) === RUN TestLRUKeys --- PASS: TestLRUKeys (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/cache 5.262s +ok k8s.io/apimachinery/pkg/util/cache 5.140s === RUN TestPretty --- PASS: TestPretty (0.00s) === RUN TestForHash @@ -5129,7 +5165,7 @@ === RUN TestOneLine --- PASS: TestOneLine (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/dump 0.050s +ok k8s.io/apimachinery/pkg/util/dump 0.047s === RUN TestHumanDuration === RUN TestHumanDuration/1s === RUN TestHumanDuration/1m10s @@ -5141,7 +5177,7 @@ === RUN TestHumanDuration/8808h0m0s === RUN TestHumanDuration/17545h0m0s === RUN TestHumanDuration/70082h0m0s ---- PASS: TestHumanDuration (0.01s) +--- PASS: TestHumanDuration (0.00s) --- PASS: TestHumanDuration/1s (0.00s) --- PASS: TestHumanDuration/1m10s (0.00s) --- PASS: TestHumanDuration/3m10s (0.00s) @@ -5190,7 +5226,7 @@ === RUN TestHumanDurationBoundaries/70080h0m0s === RUN TestHumanDurationBoundaries/78816h0m0s === RUN TestHumanDurationBoundaries/78840h0m0s ---- PASS: TestHumanDurationBoundaries (0.03s) +--- PASS: TestHumanDurationBoundaries (0.00s) --- PASS: TestHumanDurationBoundaries/-2s (0.00s) --- PASS: TestHumanDurationBoundaries/-1.999999999s (0.00s) --- PASS: TestHumanDurationBoundaries/0s (0.00s) @@ -5248,7 +5284,7 @@ === RUN TestShortHumanDurationBoundaries/8760h0m0s === RUN TestShortHumanDurationBoundaries/17519h59m59.999s === RUN TestShortHumanDurationBoundaries/17520h0m0s ---- PASS: TestShortHumanDurationBoundaries (0.03s) +--- PASS: TestShortHumanDurationBoundaries (0.00s) --- PASS: TestShortHumanDurationBoundaries/-2s (0.00s) --- PASS: TestShortHumanDurationBoundaries/-1.999999999s (0.00s) --- PASS: TestShortHumanDurationBoundaries/0s (0.00s) @@ -5269,7 +5305,7 @@ --- PASS: TestShortHumanDurationBoundaries/17519h59m59.999s (0.00s) --- PASS: TestShortHumanDurationBoundaries/17520h0m0s (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/duration 0.135s +ok k8s.io/apimachinery/pkg/util/duration 0.050s === RUN TestEmptyAggregate --- PASS: TestEmptyAggregate (0.00s) === RUN TestAggregateWithNil @@ -5315,7 +5351,7 @@ === RUN TestErrConfigurationInvalidWithErrorsIsShortCircuitsOnFirstMatch --- PASS: TestErrConfigurationInvalidWithErrorsIsShortCircuitsOnFirstMatch (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/errors 0.032s +ok k8s.io/apimachinery/pkg/util/errors 0.040s === RUN TestRead --- PASS: TestRead (0.00s) === RUN TestReadLarge @@ -5327,211 +5363,210 @@ === RUN TestJSONFrameReaderShortBuffer --- PASS: TestJSONFrameReaderShortBuffer (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/framer 0.086s +ok k8s.io/apimachinery/pkg/util/framer 0.029s === RUN TestHandshake --- PASS: TestHandshake (0.00s) === RUN TestIsUpgradeFailureError +=== 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 === RUN TestIsUpgradeFailureError/UpgradeFailure_error_should_return_true -=== RUN TestIsUpgradeFailureError/Wrapped_Non-UpgradeFailure_error_should_return_false -=== RUN TestIsUpgradeFailureError/Wrapped_UpgradeFailure_error_should_return_true ---- PASS: TestIsUpgradeFailureError (0.01s) +--- PASS: TestIsUpgradeFailureError (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: TestIsUpgradeFailureError/UpgradeFailure_error_should_return_true (0.00s) - --- PASS: TestIsUpgradeFailureError/Wrapped_Non-UpgradeFailure_error_should_return_false (0.01s) - --- PASS: TestIsUpgradeFailureError/Wrapped_UpgradeFailure_error_should_return_true (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/httpstream 0.102s +ok k8s.io/apimachinery/pkg/util/httpstream 0.050s === RUN TestConnectionCloseIsImmediateThroughAProxy ---- PASS: TestConnectionCloseIsImmediateThroughAProxy (0.07s) +--- PASS: TestConnectionCloseIsImmediateThroughAProxy (0.01s) === RUN TestConnectionPings --- PASS: TestConnectionPings (0.06s) === RUN TestConnectionRemoveStreams --- PASS: TestConnectionRemoveStreams (0.00s) === RUN TestRoundTripAndNewConnection -=== RUN TestRoundTripAndNewConnection/https_(invalid_hostname_+_hostname_verification) - roundtripper_test.go:318: Server URL: https://127.0.0.1:42621 -2024/01/22 17:20:11 http: TLS handshake error from 127.0.0.1:42842: read tcp 127.0.0.1:42621->127.0.0.1:42842: use of closed network connection +=== RUN TestRoundTripAndNewConnection/http + roundtripper_test.go:318: Server URL: http://127.0.0.1:37211 === RUN TestRoundTripAndNewConnection/https_(valid_hostname_+_RootCAs) - roundtripper_test.go:318: Server URL: https://127.0.0.1:40991 -=== RUN TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_InsecureSkipVerify)_->_http - roundtripper_test.go:318: Server URL: http://127.0.0.1:38455 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:40241 - http.go:87: Proxy Request: CONNECT 127.0.0.1:38455 HTTP/1.1 - Host: 127.0.0.1:38455 + roundtripper_test.go:318: Server URL: https://127.0.0.1:38217 +=== RUN TestRoundTripAndNewConnection/proxied_http->http + roundtripper_test.go:318: Server URL: http://127.0.0.1:38687 + roundtripper_test.go:352: Proxy URL: http://127.0.0.1:42787 + http.go:87: Proxy Request: CONNECT 127.0.0.1:38687 HTTP/1.1 + Host: 127.0.0.1:38687 User-Agent: Go-http-client/1.1 - http.go:137: Server read close, host=127.0.0.1:38455 - http.go:142: Server write close, host=127.0.0.1:38455 - http.go:145: Done handling CONNECT request, host=127.0.0.1:38455 -=== RUN TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_hostname_verification)_->_http - roundtripper_test.go:318: Server URL: http://127.0.0.1:36413 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:43463 -2024/01/22 17:20:12 http: TLS handshake error from 127.0.0.1:40874: remote error: tls: bad certificate -=== RUN TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_InsecureSkipVerify)_->_https_(invalid_hostname) - roundtripper_test.go:318: Server URL: https://127.0.0.1:39807 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:33343 - http.go:87: Proxy Request: CONNECT 127.0.0.1:39807 HTTP/1.1 - Host: 127.0.0.1:39807 + http.go:142: Server write close, host=127.0.0.1:38687 + http.go:137: Server read close, host=127.0.0.1:38687 + http.go:145: Done handling CONNECT request, host=127.0.0.1:38687 +=== RUN TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_InsecureSkipVerify)_->_http + roundtripper_test.go:318: Server URL: http://127.0.0.1:39939 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:40293 + http.go:87: Proxy Request: CONNECT 127.0.0.1:39939 HTTP/1.1 + Host: 127.0.0.1:39939 User-Agent: Go-http-client/1.1 - http.go:142: Server write close, host=127.0.0.1:39807 - http.go:137: Server read close, host=127.0.0.1:39807 - http.go:145: Done handling CONNECT request, host=127.0.0.1:39807 -=== RUN TestRoundTripAndNewConnection/proxied_https_with_auth_(invalid_hostname_+_InsecureSkipVerify)_->_https_(invalid_hostname) - roundtripper_test.go:318: Server URL: https://127.0.0.1:35863 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:37357 - http.go:87: Proxy Request: CONNECT 127.0.0.1:35863 HTTP/1.1 - Host: 127.0.0.1:35863 + http.go:142: Server write close, host=127.0.0.1:39939 + http.go:137: Server read close, host=127.0.0.1:39939 + http.go:145: Done handling CONNECT request, host=127.0.0.1:39939 +=== RUN TestRoundTripAndNewConnection/proxied_https_with_auth_(valid_hostname_+_RootCAs)_->_http + roundtripper_test.go:318: Server URL: http://127.0.0.1:40131 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:41709 + http.go:87: Proxy Request: CONNECT 127.0.0.1:40131 HTTP/1.1 + Host: 127.0.0.1:40131 Proxy-Authorization: Basic cHJveHl1c2VyOnByb3h5cGFzc3dk User-Agent: Go-http-client/1.1 - http.go:142: Server write close, host=127.0.0.1:35863 - http.go:137: Server read close, host=127.0.0.1:35863 - http.go:145: Done handling CONNECT request, host=127.0.0.1:35863 -=== RUN TestRoundTripAndNewConnection/no_upgrade_header - roundtripper_test.go:318: Server URL: http://127.0.0.1:43631 -=== RUN TestRoundTripAndNewConnection/no_switching_protocol_status_code - roundtripper_test.go:318: Server URL: http://127.0.0.1:35079 -=== RUN TestRoundTripAndNewConnection/no_connection_header - roundtripper_test.go:318: Server URL: http://127.0.0.1:44195 -=== RUN TestRoundTripAndNewConnection/proxied_https_with_auth_(invalid_hostname_+_InsecureSkipVerify)_->_http - roundtripper_test.go:318: Server URL: http://127.0.0.1:38491 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:37341 - http.go:87: Proxy Request: CONNECT 127.0.0.1:38491 HTTP/1.1 - Host: 127.0.0.1:38491 - Proxy-Authorization: Basic cHJveHl1c2VyOnByb3h5cGFzc3dk + http.go:137: Server read close, host=127.0.0.1:40131 + http.go:142: Server write close, host=127.0.0.1:40131 + http.go:145: Done handling CONNECT request, host=127.0.0.1:40131 +=== RUN TestRoundTripAndNewConnection/proxied_https_(valid_hostname_+_RootCAs)_->_https_(valid_hostname_+_RootCAs) + roundtripper_test.go:318: Server URL: https://127.0.0.1:46303 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:46205 + http.go:87: Proxy Request: CONNECT 127.0.0.1:46303 HTTP/1.1 + Host: 127.0.0.1:46303 User-Agent: Go-http-client/1.1 - http.go:142: Server write close, host=127.0.0.1:38491 - http.go:137: Server read close, host=127.0.0.1:38491 - http.go:145: Done handling CONNECT request, host=127.0.0.1:38491 + http.go:142: Server write close, host=127.0.0.1:46303 + http.go:137: Server read close, host=127.0.0.1:46303 + http.go:145: Done handling CONNECT request, host=127.0.0.1:46303 +=== RUN TestRoundTripAndNewConnection/no_switching_protocol_status_code + roundtripper_test.go:318: Server URL: http://127.0.0.1:38399 === RUN TestRoundTripAndNewConnection/proxied_https_(valid_hostname_+_RootCAs)_->_http - roundtripper_test.go:318: Server URL: http://127.0.0.1:33631 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:45117 - http.go:87: Proxy Request: CONNECT 127.0.0.1:33631 HTTP/1.1 - Host: 127.0.0.1:33631 + roundtripper_test.go:318: Server URL: http://127.0.0.1:40659 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:34073 + http.go:87: Proxy Request: CONNECT 127.0.0.1:40659 HTTP/1.1 + Host: 127.0.0.1:40659 User-Agent: Go-http-client/1.1 - http.go:142: Server write close, host=127.0.0.1:33631 - http.go:137: Server read close, host=127.0.0.1:33631 - http.go:145: Done handling CONNECT request, host=127.0.0.1:33631 -=== RUN TestRoundTripAndNewConnection/proxied_https_with_auth_(valid_hostname_+_RootCAs)_->_http - roundtripper_test.go:318: Server URL: http://127.0.0.1:33337 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:40975 - http.go:87: Proxy Request: CONNECT 127.0.0.1:33337 HTTP/1.1 - Host: 127.0.0.1:33337 + http.go:137: Server read close, host=127.0.0.1:40659 + http.go:142: Server write close, host=127.0.0.1:40659 + http.go:145: Done handling CONNECT request, host=127.0.0.1:40659 +=== RUN TestRoundTripAndNewConnection/proxied_https_with_auth_(invalid_hostname_+_InsecureSkipVerify)_->_https_(invalid_hostname) + roundtripper_test.go:318: Server URL: https://127.0.0.1:38757 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:44521 + http.go:87: Proxy Request: CONNECT 127.0.0.1:38757 HTTP/1.1 + Host: 127.0.0.1:38757 Proxy-Authorization: Basic cHJveHl1c2VyOnByb3h5cGFzc3dk User-Agent: Go-http-client/1.1 - http.go:137: Server read close, host=127.0.0.1:33337 - http.go:142: Server write close, host=127.0.0.1:33337 - http.go:145: Done handling CONNECT request, host=127.0.0.1:33337 + http.go:142: Server write close, host=127.0.0.1:38757 + http.go:137: Server read close, host=127.0.0.1:38757 + http.go:145: Done handling CONNECT request, host=127.0.0.1:38757 === RUN TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_hostname_verification)_->_https_(invalid_hostname) - roundtripper_test.go:318: Server URL: https://127.0.0.1:33381 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:38223 -2024/01/22 17:20:16 http: TLS handshake error from 127.0.0.1:60010: read tcp 127.0.0.1:38223->127.0.0.1:60010: 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:39957 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:37527 - http.go:87: Proxy Request: CONNECT 127.0.0.1:39957 HTTP/1.1 - Host: 127.0.0.1:39957 + roundtripper_test.go:318: Server URL: https://127.0.0.1:38065 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:41371 +2024/01/22 17:40:53 http: TLS handshake error from 127.0.0.1:53388: read tcp 127.0.0.1:41371->127.0.0.1:53388: use of closed network connection +=== RUN TestRoundTripAndNewConnection/https_(invalid_hostname_+_InsecureSkipVerify) + roundtripper_test.go:318: Server URL: https://127.0.0.1:36199 +=== RUN TestRoundTripAndNewConnection/proxied_https_with_auth_(invalid_hostname_+_InsecureSkipVerify)_->_http + roundtripper_test.go:318: Server URL: http://127.0.0.1:43043 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:36881 + http.go:87: Proxy Request: CONNECT 127.0.0.1:43043 HTTP/1.1 + Host: 127.0.0.1:43043 + Proxy-Authorization: Basic cHJveHl1c2VyOnByb3h5cGFzc3dk User-Agent: Go-http-client/1.1 - http.go:142: Server write close, host=127.0.0.1:39957 - http.go:137: Server read close, host=127.0.0.1:39957 - http.go:145: Done handling CONNECT request, host=127.0.0.1:39957 -=== RUN TestRoundTripAndNewConnection/proxied_http->http - roundtripper_test.go:318: Server URL: http://127.0.0.1:33811 - roundtripper_test.go:352: Proxy URL: http://127.0.0.1:46367 - http.go:87: Proxy Request: CONNECT 127.0.0.1:33811 HTTP/1.1 - Host: 127.0.0.1:33811 + http.go:142: Server write close, host=127.0.0.1:43043 + http.go:137: Server read close, host=127.0.0.1:43043 + http.go:145: Done handling CONNECT request, host=127.0.0.1:43043 +=== RUN TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_InsecureSkipVerify)_->_https_(invalid_hostname) + roundtripper_test.go:318: Server URL: https://127.0.0.1:38085 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:34935 + http.go:87: Proxy Request: CONNECT 127.0.0.1:38085 HTTP/1.1 + Host: 127.0.0.1:38085 User-Agent: Go-http-client/1.1 - http.go:142: Server write close, host=127.0.0.1:33811 - http.go:137: Server read close, host=127.0.0.1:33811 - http.go:145: Done handling CONNECT request, host=127.0.0.1:33811 -=== RUN TestRoundTripAndNewConnection/http - roundtripper_test.go:318: Server URL: http://127.0.0.1:36815 -=== RUN TestRoundTripAndNewConnection/https_(invalid_hostname_+_InsecureSkipVerify) - roundtripper_test.go:318: Server URL: https://127.0.0.1:34155 + http.go:142: Server write close, host=127.0.0.1:38085 + http.go:137: Server read close, host=127.0.0.1:38085 + http.go:145: Done handling CONNECT request, host=127.0.0.1:38085 +=== RUN TestRoundTripAndNewConnection/no_connection_header + roundtripper_test.go:318: Server URL: http://127.0.0.1:33807 +=== RUN TestRoundTripAndNewConnection/no_upgrade_header + roundtripper_test.go:318: Server URL: http://127.0.0.1:34725 +=== RUN TestRoundTripAndNewConnection/https_(invalid_hostname_+_hostname_verification) + roundtripper_test.go:318: Server URL: https://127.0.0.1:43007 +2024/01/22 17:40:54 http: TLS handshake error from 127.0.0.1:35864: read tcp 127.0.0.1:43007->127.0.0.1:35864: use of closed network connection +=== RUN TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_hostname_verification)_->_http + roundtripper_test.go:318: Server URL: http://127.0.0.1:40357 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:45403 +2024/01/22 17:40:55 http: TLS handshake error from 127.0.0.1:35956: read tcp 127.0.0.1:45403->127.0.0.1:35956: use of closed network connection === RUN TestRoundTripAndNewConnection/proxied_https_with_auth_(valid_hostname_+_RootCAs)_->_https_(valid_hostname_+_RootCAs) - roundtripper_test.go:318: Server URL: https://127.0.0.1:33111 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:37607 - http.go:87: Proxy Request: CONNECT 127.0.0.1:33111 HTTP/1.1 - Host: 127.0.0.1:33111 + roundtripper_test.go:318: Server URL: https://127.0.0.1:32819 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:36373 + http.go:87: Proxy Request: CONNECT 127.0.0.1:32819 HTTP/1.1 + Host: 127.0.0.1:32819 Proxy-Authorization: Basic cHJveHl1c2VyOnByb3h5cGFzc3dk User-Agent: Go-http-client/1.1 - http.go:142: Server write close, host=127.0.0.1:33111 - http.go:137: Server read close, host=127.0.0.1:33111 - http.go:145: Done handling CONNECT request, host=127.0.0.1:33111 + http.go:142: Server write close, host=127.0.0.1:32819 + http.go:137: Server read close, host=127.0.0.1:32819 + http.go:145: Done handling CONNECT request, host=127.0.0.1:32819 === 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:42141 - roundtripper_test.go:352: Proxy URL: https://127.0.0.1:38079 - http.go:87: Proxy Request: CONNECT 127.0.0.1:42141 HTTP/1.1 - Host: 127.0.0.1:42141 + roundtripper_test.go:318: Server URL: https://127.0.0.1:45303 + roundtripper_test.go:352: Proxy URL: https://127.0.0.1:38047 + http.go:87: Proxy Request: CONNECT 127.0.0.1:45303 HTTP/1.1 + Host: 127.0.0.1:45303 Proxy-Authorization: Basic cHJveHkgdXNlcjpwcm94eXBhc3N3ZCU= User-Agent: Go-http-client/1.1 - http.go:142: Server write close, host=127.0.0.1:42141 - http.go:137: Server read close, host=127.0.0.1:42141 - http.go:145: Done handling CONNECT request, host=127.0.0.1:42141 + http.go:142: Server write close, host=127.0.0.1:45303 + http.go:137: Server read close, host=127.0.0.1:45303 + http.go:145: Done handling CONNECT request, host=127.0.0.1:45303 === RUN TestRoundTripAndNewConnection/no_headers - roundtripper_test.go:318: Server URL: http://127.0.0.1:33927 ---- PASS: TestRoundTripAndNewConnection (8.92s) - --- PASS: TestRoundTripAndNewConnection/https_(invalid_hostname_+_hostname_verification) (0.37s) - --- PASS: TestRoundTripAndNewConnection/https_(valid_hostname_+_RootCAs) (0.33s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_InsecureSkipVerify)_->_http (0.42s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_hostname_verification)_->_http (0.41s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_InsecureSkipVerify)_->_https_(invalid_hostname) (0.76s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_with_auth_(invalid_hostname_+_InsecureSkipVerify)_->_https_(invalid_hostname) (0.97s) - --- PASS: TestRoundTripAndNewConnection/no_upgrade_header (0.01s) + roundtripper_test.go:318: Server URL: http://127.0.0.1:45787 +--- PASS: TestRoundTripAndNewConnection (4.37s) + --- PASS: TestRoundTripAndNewConnection/http (0.03s) + --- PASS: TestRoundTripAndNewConnection/https_(valid_hostname_+_RootCAs) (0.23s) + --- PASS: TestRoundTripAndNewConnection/proxied_http->http (0.03s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_InsecureSkipVerify)_->_http (0.27s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_with_auth_(valid_hostname_+_RootCAs)_->_http (0.31s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_(valid_hostname_+_RootCAs)_->_https_(valid_hostname_+_RootCAs) (0.45s) --- PASS: TestRoundTripAndNewConnection/no_switching_protocol_status_code (0.01s) - --- PASS: TestRoundTripAndNewConnection/no_connection_header (0.01s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_with_auth_(invalid_hostname_+_InsecureSkipVerify)_->_http (0.71s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_(valid_hostname_+_RootCAs)_->_http (0.68s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_with_auth_(valid_hostname_+_RootCAs)_->_http (0.57s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_hostname_verification)_->_https_(invalid_hostname) (0.47s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_(valid_hostname_+_RootCAs)_->_https_(valid_hostname_+_RootCAs) (0.96s) - --- PASS: TestRoundTripAndNewConnection/proxied_http->http (0.08s) - --- PASS: TestRoundTripAndNewConnection/http (0.06s) - --- PASS: TestRoundTripAndNewConnection/https_(invalid_hostname_+_InsecureSkipVerify) (0.53s) - --- PASS: TestRoundTripAndNewConnection/proxied_https_with_auth_(valid_hostname_+_RootCAs)_->_https_(valid_hostname_+_RootCAs) (0.95s) - --- PASS: TestRoundTripAndNewConnection/proxied_valid_https,_proxy_auth_with_chars_that_percent_escape_->_valid_https (0.58s) - --- PASS: TestRoundTripAndNewConnection/no_headers (0.01s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_(valid_hostname_+_RootCAs)_->_http (0.28s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_with_auth_(invalid_hostname_+_InsecureSkipVerify)_->_https_(invalid_hostname) (0.51s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_hostname_verification)_->_https_(invalid_hostname) (0.23s) + --- PASS: TestRoundTripAndNewConnection/https_(invalid_hostname_+_InsecureSkipVerify) (0.23s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_with_auth_(invalid_hostname_+_InsecureSkipVerify)_->_http (0.24s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_InsecureSkipVerify)_->_https_(invalid_hostname) (0.39s) + --- PASS: TestRoundTripAndNewConnection/no_connection_header (0.00s) + --- PASS: TestRoundTripAndNewConnection/no_upgrade_header (0.02s) + --- PASS: TestRoundTripAndNewConnection/https_(invalid_hostname_+_hostname_verification) (0.22s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_(invalid_hostname_+_hostname_verification)_->_http (0.15s) + --- PASS: TestRoundTripAndNewConnection/proxied_https_with_auth_(valid_hostname_+_RootCAs)_->_https_(valid_hostname_+_RootCAs) (0.38s) + --- PASS: TestRoundTripAndNewConnection/proxied_valid_https,_proxy_auth_with_chars_that_percent_escape_->_valid_https (0.37s) + --- PASS: TestRoundTripAndNewConnection/no_headers (0.00s) === RUN TestRoundTripConstuctor -=== RUN TestRoundTripConstuctor/Proxier_with_UpgradeTransport:_error -=== RUN TestRoundTripConstuctor/Only_UpgradeTransport:_no_error === RUN TestRoundTripConstuctor/Basic_TLSConfig;_no_error === RUN TestRoundTripConstuctor/Basic_TLSConfig_and_Proxier:_no_error === RUN TestRoundTripConstuctor/TLSConfig_with_UpgradeTransport:_error ---- PASS: TestRoundTripConstuctor (0.01s) - --- PASS: TestRoundTripConstuctor/Proxier_with_UpgradeTransport:_error (0.00s) - --- PASS: TestRoundTripConstuctor/Only_UpgradeTransport:_no_error (0.00s) +=== RUN TestRoundTripConstuctor/Proxier_with_UpgradeTransport:_error +=== RUN TestRoundTripConstuctor/Only_UpgradeTransport:_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) === RUN TestRoundTripSocks5AndNewConnection -=== RUN TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(invalid_hostname_+_InsecureSkipVerify) -=== RUN TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(invalid_hostname_+_hostname_verification) -2024/01/22 17:20:20 [ERR] socks: Failed to handle request: readfrom tcp 127.0.0.1:32931->127.0.0.1:36274: splice: connection reset by peer -2024/01/22 17:20:20 http: TLS handshake error from 127.0.0.1:58334: read tcp 127.0.0.1:33413->127.0.0.1:58334: use of closed network connection -=== RUN TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(valid_hostname_+_RootCAs) === RUN TestRoundTripSocks5AndNewConnection/proxied_without_auth_->_http === RUN TestRoundTripSocks5AndNewConnection/proxied_with_invalid_auth_->_http -2024/01/22 17:20:21 [ERR] socks: Failed to authenticate: User authentication failed === RUN TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_http ---- PASS: TestRoundTripSocks5AndNewConnection (1.56s) - --- PASS: TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(invalid_hostname_+_InsecureSkipVerify) (0.52s) - --- PASS: TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(invalid_hostname_+_hostname_verification) (0.41s) - --- PASS: TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(valid_hostname_+_RootCAs) (0.46s) - --- PASS: TestRoundTripSocks5AndNewConnection/proxied_without_auth_->_http (0.08s) - --- PASS: TestRoundTripSocks5AndNewConnection/proxied_with_invalid_auth_->_http (0.01s) - --- PASS: TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_http (0.07s) -2024/01/22 17:20:21 [ERR] socks: Failed to handle request: readfrom tcp 127.0.0.1:42726->127.0.0.1:43627: splice: connection reset by peer +2024/01/22 17:40:55 [ERR] socks: Failed to authenticate: User authentication failed +=== RUN TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(invalid_hostname_+_InsecureSkipVerify) +=== RUN TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(invalid_hostname_+_hostname_verification) +2024/01/22 17:40:56 http: TLS handshake error from 127.0.0.1:49170: read tcp 127.0.0.1:42081->127.0.0.1:49170: use of closed network connection +=== RUN TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(valid_hostname_+_RootCAs) +2024/01/22 17:40:56 [ERR] socks: Failed to handle request: readfrom tcp 127.0.0.1:38447->127.0.0.1:54248: splice: connection reset by peer +--- PASS: TestRoundTripSocks5AndNewConnection (0.55s) + --- 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.05s) + --- PASS: TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(invalid_hostname_+_InsecureSkipVerify) (0.18s) + --- PASS: TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(invalid_hostname_+_hostname_verification) (0.14s) + --- PASS: TestRoundTripSocks5AndNewConnection/proxied_with_valid_auth_->_https_(valid_hostname_+_RootCAs) (0.14s) === RUN TestRoundTripPassesContextToDialer === RUN TestRoundTripPassesContextToDialer/http://127.0.0.1:1233/ === RUN TestRoundTripPassesContextToDialer/https://127.0.0.1:1233/ @@ -5539,37 +5574,37 @@ --- PASS: TestRoundTripPassesContextToDialer/http://127.0.0.1:1233/ (0.00s) --- PASS: TestRoundTripPassesContextToDialer/https://127.0.0.1:1233/ (0.00s) === RUN TestUpgradeResponse ---- PASS: TestUpgradeResponse (0.03s) +--- PASS: TestUpgradeResponse (0.01s) PASS -ok k8s.io/apimachinery/pkg/util/httpstream/spdy 10.939s +ok k8s.io/apimachinery/pkg/util/httpstream/spdy 5.096s === RUN TestRawConn ---- PASS: TestRawConn (0.02s) +--- PASS: TestRawConn (0.01s) === RUN TestBase64Conn ---- PASS: TestBase64Conn (0.02s) +--- PASS: TestBase64Conn (0.00s) === RUN TestVersionedConn ---- PASS: TestVersionedConn (0.08s) +--- PASS: TestVersionedConn (0.03s) === RUN TestIsWebSocketRequestWithStreamCloseProtocol --- PASS: TestIsWebSocketRequestWithStreamCloseProtocol (0.00s) === RUN TestProtocolSupportsStreamClose --- PASS: TestProtocolSupportsStreamClose (0.00s) === RUN TestStream ---- PASS: TestStream (0.01s) +--- PASS: TestStream (0.00s) === RUN TestStreamPing ---- PASS: TestStreamPing (0.02s) +--- PASS: TestStreamPing (0.00s) === RUN TestStreamBase64 ---- PASS: TestStreamBase64 (0.02s) +--- PASS: TestStreamBase64 (0.00s) === RUN TestStreamVersionedBase64 ---- PASS: TestStreamVersionedBase64 (0.02s) +--- PASS: TestStreamVersionedBase64 (0.00s) === RUN TestStreamVersionedCopy ---- PASS: TestStreamVersionedCopy (0.06s) +--- PASS: TestStreamVersionedCopy (0.03s) === RUN TestStreamError ---- PASS: TestStreamError (0.01s) +--- PASS: TestStreamError (0.00s) === RUN TestStreamSurvivesPanic ---- PASS: TestStreamSurvivesPanic (0.01s) +--- PASS: TestStreamSurvivesPanic (0.02s) === RUN TestStreamClosedDuringRead ---- PASS: TestStreamClosedDuringRead (0.36s) +--- PASS: TestStreamClosedDuringRead (0.10s) PASS -ok k8s.io/apimachinery/pkg/util/httpstream/wsstream 0.825s +ok k8s.io/apimachinery/pkg/util/httpstream/wsstream 0.264s === RUN TestFromInt --- PASS: TestFromInt (0.00s) === RUN TestFromInt32 @@ -5581,7 +5616,7 @@ === RUN TestIntOrStringMarshalJSON --- PASS: TestIntOrStringMarshalJSON (0.00s) === RUN TestIntOrStringMarshalJSONUnmarshalYAML ---- PASS: TestIntOrStringMarshalJSONUnmarshalYAML (0.01s) +--- PASS: TestIntOrStringMarshalJSONUnmarshalYAML (0.00s) === RUN TestGetIntFromIntOrString === RUN TestGetIntFromIntOrString/#00 === RUN TestGetIntFromIntOrString/#01 @@ -5626,7 +5661,7 @@ intstr_test.go:312: test case 8 --- PASS: TestParse (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/intstr 0.117s +ok k8s.io/apimachinery/pkg/util/intstr 0.038s === RUN TestEvaluateTypes === RUN TestEvaluateTypes/0_map === RUN TestEvaluateTypes/0_slice @@ -5733,7 +5768,7 @@ === RUN TestEvaluateTypes/34_map === RUN TestEvaluateTypes/34_slice === RUN TestEvaluateTypes/34_raw ---- PASS: TestEvaluateTypes (0.10s) +--- PASS: TestEvaluateTypes (0.03s) --- PASS: TestEvaluateTypes/0_map (0.00s) --- PASS: TestEvaluateTypes/0_slice (0.00s) --- PASS: TestEvaluateTypes/0_raw (0.00s) @@ -5758,7 +5793,7 @@ --- PASS: TestEvaluateTypes/7_map (0.00s) --- PASS: TestEvaluateTypes/7_slice (0.00s) --- PASS: TestEvaluateTypes/7_raw (0.00s) - --- PASS: TestEvaluateTypes/8_map (0.01s) + --- PASS: TestEvaluateTypes/8_map (0.00s) --- PASS: TestEvaluateTypes/8_slice (0.00s) --- PASS: TestEvaluateTypes/8_raw (0.00s) --- PASS: TestEvaluateTypes/9_map (0.00s) @@ -5769,7 +5804,7 @@ --- PASS: TestEvaluateTypes/10_raw (0.00s) --- PASS: TestEvaluateTypes/11_map (0.00s) --- PASS: TestEvaluateTypes/11_slice (0.00s) - --- PASS: TestEvaluateTypes/11_raw (0.01s) + --- PASS: TestEvaluateTypes/11_raw (0.00s) --- PASS: TestEvaluateTypes/12_map (0.00s) --- PASS: TestEvaluateTypes/12_slice (0.00s) --- PASS: TestEvaluateTypes/12_raw (0.00s) @@ -5784,7 +5819,7 @@ --- PASS: TestEvaluateTypes/15_raw (0.00s) --- PASS: TestEvaluateTypes/16_map (0.00s) --- PASS: TestEvaluateTypes/16_slice (0.00s) - --- PASS: TestEvaluateTypes/16_raw (0.00s) + --- PASS: TestEvaluateTypes/16_raw (0.01s) --- PASS: TestEvaluateTypes/17_map (0.00s) --- PASS: TestEvaluateTypes/17_slice (0.00s) --- PASS: TestEvaluateTypes/17_raw (0.00s) @@ -5822,7 +5857,7 @@ --- PASS: TestEvaluateTypes/28_slice (0.00s) --- PASS: TestEvaluateTypes/28_raw (0.00s) --- PASS: TestEvaluateTypes/29_map (0.00s) - --- PASS: TestEvaluateTypes/29_slice (0.00s) + --- PASS: TestEvaluateTypes/29_slice (0.01s) --- PASS: TestEvaluateTypes/29_raw (0.00s) --- PASS: TestEvaluateTypes/30_map (0.00s) --- PASS: TestEvaluateTypes/30_slice (0.00s) @@ -5845,21 +5880,22 @@ json_test.go:416: json: Unmarshal(nil *map[string]interface {}) --- PASS: TestUnmarshalNil (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/json 0.137s +ok k8s.io/apimachinery/pkg/util/json 0.046s === RUN TestKeepOrDeleteNullInObj ---- PASS: TestKeepOrDeleteNullInObj (0.02s) +--- PASS: TestKeepOrDeleteNullInObj (0.01s) === RUN TestCreateThreeWayJSONMergePatch ---- PASS: TestCreateThreeWayJSONMergePatch (0.09s) +--- PASS: TestCreateThreeWayJSONMergePatch (0.03s) PASS -ok k8s.io/apimachinery/pkg/util/jsonmergepatch 0.178s +ok k8s.io/apimachinery/pkg/util/jsonmergepatch 0.096s ? 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.058s +ok k8s.io/apimachinery/pkg/util/mergepatch 0.038s === RUN TestGetNameFromCallsite === RUN TestGetNameFromCallsite/simple === RUN TestGetNameFromCallsite/ignore-package @@ -5871,14 +5907,13 @@ --- PASS: TestGetNameFromCallsite/ignore-file (0.00s) --- PASS: TestGetNameFromCallsite/ignore-multiple (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/naming 0.078s -? k8s.io/apimachinery/pkg/util/net/testing [no test files] +ok k8s.io/apimachinery/pkg/util/naming 0.042s === RUN TestGetClientIP --- PASS: TestGetClientIP (0.00s) === RUN TestAppendForwardedForHeader --- PASS: TestAppendForwardedForHeader (0.00s) === RUN TestProxierWithNoProxyCIDR ---- PASS: TestProxierWithNoProxyCIDR (0.00s) +--- PASS: TestProxierWithNoProxyCIDR (0.01s) === RUN TestTLSClientConfigHolder --- PASS: TestTLSClientConfigHolder (0.00s) === RUN TestJoinPreservingTrailingSlash @@ -5943,7 +5978,7 @@ === RUN TestSourceIPs/full_redundancy === RUN TestSourceIPs/full_ipv6 === RUN TestSourceIPs/mixed_ipv4_ipv6 ---- PASS: TestSourceIPs (0.01s) +--- PASS: TestSourceIPs (0.00s) --- 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) @@ -6028,7 +6063,7 @@ === RUN TestNewWarningHeader/valid_low_code === RUN TestNewWarningHeader/valid_high_code === RUN TestNewWarningHeader/valid_utf-8 ---- PASS: TestNewWarningHeader (0.01s) +--- PASS: TestNewWarningHeader (0.00s) --- PASS: TestNewWarningHeader/code_too_low (0.00s) --- PASS: TestNewWarningHeader/code_too_high (0.00s) --- PASS: TestNewWarningHeader/agent_with_space (0.00s) @@ -6072,10 +6107,10 @@ --- PASS: TestIsProbableEOF/with_url_error (0.00s) --- PASS: TestIsProbableEOF/with_unrecognized_error (0.00s) === RUN TestReadIdleTimeoutSeconds -W0122 17:23:59.207303 11342 http.go:151] Illegal HTTP2_READ_IDLE_TIMEOUT_SECONDS("illegal value"): strconv.Atoi: parsing "illegal value": invalid syntax. Default value 30 is used +W0122 17:42:26.738385 11476 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 -W0122 17:23:59.208141 11342 http.go:165] Illegal HTTP2_PING_TIMEOUT_SECONDS("illegal value"): strconv.Atoi: parsing "illegal value": invalid syntax. Default value 15 is used +W0122 17:42:26.738650 11476 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) @@ -6100,13 +6135,13 @@ === RUN TestGetIPFromHostInterfaces --- PASS: TestGetIPFromHostInterfaces (0.00s) === RUN TestFailGettingIPv4Routes ---- PASS: TestFailGettingIPv4Routes (0.09s) +--- PASS: TestFailGettingIPv4Routes (0.00s) === RUN TestFailGettingIPv6Routes --- PASS: TestFailGettingIPv6Routes (0.00s) === RUN TestGetAllDefaultRoutesFailNoV4RouteFile --- PASS: TestGetAllDefaultRoutesFailNoV4RouteFile (0.00s) === RUN TestGetAllDefaultRoutes ---- PASS: TestGetAllDefaultRoutes (0.03s) +--- PASS: TestGetAllDefaultRoutes (0.00s) === RUN TestPortRange --- PASS: TestPortRange (0.00s) === RUN TestSplitSchemeNamePort @@ -6116,50 +6151,54 @@ === RUN TestIsConnectionRefused --- PASS: TestIsConnectionRefused (0.00s) === RUN TestIsConnectionReset ---- PASS: TestIsConnectionReset (2.38s) +--- PASS: TestIsConnectionReset (2.18s) PASS -ok k8s.io/apimachinery/pkg/util/net 2.632s +ok k8s.io/apimachinery/pkg/util/net 2.300s ? k8s.io/apimachinery/pkg/util/remotecommand [no test files] === RUN TestDialURL -2024/01/22 17:24:05 http: TLS handshake error from 127.0.0.1:57020: read tcp 127.0.0.1:44147->127.0.0.1:57020: use of closed network connection -2024/01/22 17:24:06 http: TLS handshake error from 127.0.0.1:43628: read tcp 127.0.0.1:36427->127.0.0.1:43628: use of closed network connection -2024/01/22 17:24:06 http: TLS handshake error from 127.0.0.1:34424: remote error: tls: bad certificate -2024/01/22 17:24:07 http: TLS handshake error from 127.0.0.1:39510: read tcp 127.0.0.1:42091->127.0.0.1:39510: use of closed network connection -2024/01/22 17:24:07 http: TLS handshake error from 127.0.0.1:60040: read tcp 127.0.0.1:42279->127.0.0.1:60040: use of closed network connection -2024/01/22 17:24:07 http: TLS handshake error from 127.0.0.1:56664: read tcp 127.0.0.1:36557->127.0.0.1:56664: use of closed network connection -2024/01/22 17:24:09 http: TLS handshake error from 127.0.0.1:47848: read tcp 127.0.0.1:33655->127.0.0.1:47848: use of closed network connection ---- PASS: TestDialURL (4.63s) +2024/01/22 17:42:38 http: TLS handshake error from 127.0.0.1:54860: read tcp 127.0.0.1:37419->127.0.0.1:54860: use of closed network connection +2024/01/22 17:42:38 http: TLS handshake error from 127.0.0.1:47612: read tcp 127.0.0.1:40387->127.0.0.1:47612: use of closed network connection +2024/01/22 17:42:38 http: TLS handshake error from 127.0.0.1:58340: read tcp 127.0.0.1:42195->127.0.0.1:58340: use of closed network connection +2024/01/22 17:42:38 http: TLS handshake error from 127.0.0.1:43628: read tcp 127.0.0.1:38549->127.0.0.1:43628: use of closed network connection +2024/01/22 17:42:38 http: TLS handshake error from 127.0.0.1:54536: read tcp 127.0.0.1:45643->127.0.0.1:54536: use of closed network connection +2024/01/22 17:42:39 http: TLS handshake error from 127.0.0.1:49662: read tcp 127.0.0.1:33025->127.0.0.1:49662: use of closed network connection +2024/01/22 17:42:39 http: TLS handshake error from 127.0.0.1:41442: read tcp 127.0.0.1:34955->127.0.0.1:41442: use of closed network connection +2024/01/22 17:42:39 http: TLS handshake error from 127.0.0.1:60152: read tcp 127.0.0.1:45519->127.0.0.1:60152: use of closed network connection +2024/01/22 17:42:39 http: TLS handshake error from 127.0.0.1:54066: read tcp 127.0.0.1:35557->127.0.0.1:54066: use of closed network connection +2024/01/22 17:42:39 http: TLS handshake error from 127.0.0.1:41670: read tcp 127.0.0.1:36239->127.0.0.1:41670: use of closed network connection +2024/01/22 17:42:40 http: TLS handshake error from 127.0.0.1:59888: remote error: tls: bad certificate +--- PASS: TestDialURL (1.79s) === RUN TestProxyTransport ---- PASS: TestProxyTransport (0.22s) +--- PASS: TestProxyTransport (0.06s) === RUN TestRewriteResponse ---- PASS: TestRewriteResponse (0.11s) +--- PASS: TestRewriteResponse (0.07s) === RUN TestServeHTTP -E0122 17:24:09.691615 11380 upgradeaware.go:364] Proxy upgrade error: invalid upgrade response: status code 200 ---- PASS: TestServeHTTP (0.20s) +E0122 17:42:40.312274 11632 upgradeaware.go:364] Proxy upgrade error: invalid upgrade response: status code 200 +--- PASS: TestServeHTTP (0.11s) === RUN TestProxyUpgrade ---- PASS: TestProxyUpgrade (1.86s) +--- PASS: TestProxyUpgrade (0.98s) === RUN TestProxyUpgradeConnectionErrorResponse ---- PASS: TestProxyUpgradeConnectionErrorResponse (0.01s) +--- PASS: TestProxyUpgradeConnectionErrorResponse (0.00s) === RUN TestProxyUpgradeErrorResponseTerminates === RUN TestProxyUpgradeErrorResponseTerminates/code=400 === RUN TestProxyUpgradeErrorResponseTerminates/code=500 ---- PASS: TestProxyUpgradeErrorResponseTerminates (2.05s) +--- PASS: TestProxyUpgradeErrorResponseTerminates (2.02s) --- PASS: TestProxyUpgradeErrorResponseTerminates/code=400 (1.01s) - --- PASS: TestProxyUpgradeErrorResponseTerminates/code=500 (1.04s) + --- PASS: TestProxyUpgradeErrorResponseTerminates/code=500 (1.01s) === RUN TestProxyUpgradeErrorResponse === RUN TestProxyUpgradeErrorResponse/code=200 -E0122 17:24:13.698683 11380 upgradeaware.go:364] Proxy upgrade error: invalid upgrade response: status code 200 +E0122 17:42:43.353472 11632 upgradeaware.go:364] Proxy upgrade error: invalid upgrade response: status code 200 === RUN TestProxyUpgradeErrorResponse/code=300 -E0122 17:24:13.730423 11380 upgradeaware.go:364] Proxy upgrade error: invalid upgrade response: status code 300 +E0122 17:42:43.359355 11632 upgradeaware.go:364] Proxy upgrade error: invalid upgrade response: status code 300 === RUN TestProxyUpgradeErrorResponse/code=302 -E0122 17:24:13.757623 11380 upgradeaware.go:364] Proxy upgrade error: invalid upgrade response: status code 302 +E0122 17:42:43.361480 11632 upgradeaware.go:364] Proxy upgrade error: invalid upgrade response: status code 302 === RUN TestProxyUpgradeErrorResponse/code=307 -E0122 17:24:13.802245 11380 upgradeaware.go:364] Proxy upgrade error: invalid upgrade response: status code 307 ---- PASS: TestProxyUpgradeErrorResponse (0.14s) - --- PASS: TestProxyUpgradeErrorResponse/code=200 (0.03s) - --- PASS: TestProxyUpgradeErrorResponse/code=300 (0.03s) - --- PASS: TestProxyUpgradeErrorResponse/code=302 (0.04s) - --- PASS: TestProxyUpgradeErrorResponse/code=307 (0.04s) +E0122 17:42:43.367674 11632 upgradeaware.go:364] Proxy upgrade error: invalid upgrade response: status code 307 +--- PASS: TestProxyUpgradeErrorResponse (0.02s) + --- PASS: TestProxyUpgradeErrorResponse/code=200 (0.00s) + --- PASS: TestProxyUpgradeErrorResponse/code=300 (0.01s) + --- PASS: TestProxyUpgradeErrorResponse/code=302 (0.00s) + --- PASS: TestProxyUpgradeErrorResponse/code=307 (0.01s) === RUN TestRejectForwardingRedirectsOption === RUN TestRejectForwardingRedirectsOption/reject_redirection_enabled_in_proxy,_backend_server_sending_200_response === RUN TestRejectForwardingRedirectsOption/reject_redirection_enabled_in_proxy,_backend_server_sending_301_response @@ -6167,25 +6206,25 @@ === 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.16s) - --- PASS: TestRejectForwardingRedirectsOption/reject_redirection_enabled_in_proxy,_backend_server_sending_200_response (0.02s) - --- PASS: TestRejectForwardingRedirectsOption/reject_redirection_enabled_in_proxy,_backend_server_sending_301_response (0.02s) - --- PASS: TestRejectForwardingRedirectsOption/reject_redirection_enabled_in_proxy,_backend_server_sending_304_response_with_a_location_header (0.03s) - --- PASS: TestRejectForwardingRedirectsOption/reject_redirection_enabled_in_proxy,_backend_server_sending_304_response_with_no_location_header (0.04s) - --- PASS: TestRejectForwardingRedirectsOption/reject_redirection_disabled_in_proxy,_backend_server_sending_200_response (0.02s) - --- PASS: TestRejectForwardingRedirectsOption/reject_redirection_disabled_in_proxy,_backend_server_sending_301_response (0.02s) +--- PASS: TestRejectForwardingRedirectsOption (0.03s) + --- PASS: TestRejectForwardingRedirectsOption/reject_redirection_enabled_in_proxy,_backend_server_sending_200_response (0.00s) + --- PASS: TestRejectForwardingRedirectsOption/reject_redirection_enabled_in_proxy,_backend_server_sending_301_response (0.01s) + --- PASS: TestRejectForwardingRedirectsOption/reject_redirection_enabled_in_proxy,_backend_server_sending_304_response_with_a_location_header (0.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_301_response (0.00s) === RUN TestDefaultProxyTransport --- PASS: TestDefaultProxyTransport (0.00s) === RUN TestProxyRequestContentLengthAndTransferEncoding ---- PASS: TestProxyRequestContentLengthAndTransferEncoding (0.34s) +--- PASS: TestProxyRequestContentLengthAndTransferEncoding (0.04s) === RUN TestFlushIntervalHeaders ---- PASS: TestFlushIntervalHeaders (0.03s) +--- PASS: TestFlushIntervalHeaders (0.00s) === RUN TestErrorPropagation ---- PASS: TestErrorPropagation (0.01s) +--- PASS: TestErrorPropagation (0.02s) === RUN TestProxyRedirectsforRootPath --- PASS: TestProxyRedirectsforRootPath (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/proxy 9.986s +ok k8s.io/apimachinery/pkg/util/proxy 5.211s === RUN TestString --- PASS: TestString (0.00s) === RUN TestRangePanic @@ -6197,11 +6236,11 @@ === RUN TestIntnRange --- PASS: TestIntnRange (0.00s) === RUN TestInt63nRange ---- PASS: TestInt63nRange (0.01s) +--- PASS: TestInt63nRange (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/rand 0.095s +ok k8s.io/apimachinery/pkg/util/rand 0.036s === RUN TestHandleCrash -E0122 17:24:17.212042 11456 runtime.go:77] Observed a panic: Test Panic +E0122 17:42:38.289616 11630 runtime.go:77] Observed a panic: Test Panic goroutine 6 [running]: k8s.io/apimachinery/pkg/util/runtime.logPanic({0x1adf40, 0x2146d4}) /build/reproducible-path/golang-k8s-apimachinery-0.29.0/_build/src/k8s.io/apimachinery/pkg/util/runtime/runtime.go:75 +0x94 @@ -6209,9 +6248,9 @@ /build/reproducible-path/golang-k8s-apimachinery-0.29.0/_build/src/k8s.io/apimachinery/pkg/util/runtime/runtime.go:49 +0x78 panic({0x1adf40, 0x2146d4}) /usr/lib/go-1.21/src/runtime/panic.go:914 +0x244 -k8s.io/apimachinery/pkg/util/runtime.TestHandleCrash(0x10a20f0) +k8s.io/apimachinery/pkg/util/runtime.TestHandleCrash(0x1ca20f0) /build/reproducible-path/golang-k8s-apimachinery-0.29.0/_build/src/k8s.io/apimachinery/pkg/util/runtime/runtime_test.go:39 +0x78 -testing.tRunner(0x10a20f0, 0x1e6dcc) +testing.tRunner(0x1ca20f0, 0x1e6dcc) /usr/lib/go-1.21/src/testing/testing.go:1595 +0x124 created by testing.(*T).Run in goroutine 1 /usr/lib/go-1.21/src/testing/testing.go:1648 +0x3f0 @@ -6225,9 +6264,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.105s +ok k8s.io/apimachinery/pkg/util/runtime 1.041s === RUN TestStringSet --- PASS: TestStringSet (0.00s) === RUN TestStringSetDeleteMultiples @@ -6279,156 +6318,156 @@ === RUN TestIntersection --- PASS: TestIntersection (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/sets 0.070s +ok k8s.io/apimachinery/pkg/util/sets 0.031s ? k8s.io/apimachinery/pkg/util/strategicpatch/testing [no test files] ? k8s.io/apimachinery/pkg/util/uuid [no test files] === RUN TestSortMergeLists ---- PASS: TestSortMergeLists (0.20s) +--- 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([nonMergingList_nonMergingIntList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_name_value_other_mergingList_mergingIntList_retainKeysMergingList]) +=== RUN TestCustomStrategicMergePatch/unique_scalars_when_merging_lists/Kind([other_nonMergingList_mergingIntList_mergeItemPtr_simpleMap_replacingItem_name_value_mergingList_nonMergingIntList_retainKeysMap_retainKeysMergingList]) === RUN TestCustomStrategicMergePatch/unique_scalars_when_merging_lists/Struct === RUN TestCustomStrategicMergePatch/delete_map_from_nested_map === RUN TestCustomStrategicMergePatch/delete_map_from_nested_map/struct -=== RUN TestCustomStrategicMergePatch/delete_map_from_nested_map/Kind([nonMergingList_nonMergingIntList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_name_value_other_mergingList_mergingIntList_retainKeysMergingList]) +=== RUN TestCustomStrategicMergePatch/delete_map_from_nested_map/Kind([other_nonMergingList_mergingIntList_mergeItemPtr_simpleMap_replacingItem_name_value_mergingList_nonMergingIntList_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([mergingList_mergingIntList_retainKeysMergingList_name_value_other_simpleMap_replacingItem_retainKeysMap_nonMergingList_nonMergingIntList_mergeItemPtr]) +=== RUN TestCustomStrategicMergePatch/delete_all_items_from_merging_list/Kind([other_nonMergingList_mergingIntList_mergeItemPtr_simpleMap_replacingItem_name_value_mergingList_nonMergingIntList_retainKeysMap_retainKeysMergingList]) === RUN TestCustomStrategicMergePatch/delete_all_items_from_merging_list/Struct === RUN TestCustomStrategicMergePatch/merge_empty_merging_lists === RUN TestCustomStrategicMergePatch/merge_empty_merging_lists/struct -=== RUN TestCustomStrategicMergePatch/merge_empty_merging_lists/Kind([simpleMap_replacingItem_retainKeysMap_nonMergingList_nonMergingIntList_mergeItemPtr_mergingList_mergingIntList_retainKeysMergingList_name_value_other]) +=== RUN TestCustomStrategicMergePatch/merge_empty_merging_lists/Kind([other_nonMergingList_mergingIntList_mergeItemPtr_simpleMap_replacingItem_name_value_mergingList_nonMergingIntList_retainKeysMap_retainKeysMergingList]) === RUN TestCustomStrategicMergePatch/merge_empty_merging_lists/Struct === RUN TestCustomStrategicMergePatch/delete_all_keys_from_map === RUN TestCustomStrategicMergePatch/delete_all_keys_from_map/struct -=== RUN TestCustomStrategicMergePatch/delete_all_keys_from_map/Kind([value_other_mergingList_mergingIntList_retainKeysMergingList_name_nonMergingIntList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_nonMergingList]) +=== RUN TestCustomStrategicMergePatch/delete_all_keys_from_map/Kind([replacingItem_other_nonMergingList_mergingIntList_mergeItemPtr_simpleMap_retainKeysMergingList_name_value_mergingList_nonMergingIntList_retainKeysMap]) === 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([other_mergingList_mergingIntList_retainKeysMergingList_name_value_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_nonMergingList_nonMergingIntList]) +=== RUN TestCustomStrategicMergePatch/add_key_and_delete_all_keys_from_map/Kind([retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingIntList_simpleMap_replacingItem_other_nonMergingList_mergingIntList_mergeItemPtr]) === 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([name_value_other_mergingList_mergingIntList_retainKeysMergingList_nonMergingList_nonMergingIntList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap]) +=== RUN TestCustomStrategicMergePatch/delete_all_duplicate_entries_in_a_merging_list/Kind([simpleMap_replacingItem_other_nonMergingList_mergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingIntList]) === 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([nonMergingList_nonMergingIntList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_name_value_other_mergingList_mergingIntList_retainKeysMergingList]) +=== RUN TestCustomStrategicMergePatch/retainKeys_map_can_add_a_field_when_no_retainKeys_directive_present/Kind([mergingIntList_mergeItemPtr_simpleMap_replacingItem_other_nonMergingList_mergingList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name_value]) === 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([nonMergingList_nonMergingIntList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_name_value_other_mergingList_mergingIntList_retainKeysMergingList]) +=== RUN TestCustomStrategicMergePatch/retainKeys_map_can_change_a_field_when_no_retainKeys_directive_present/Kind([simpleMap_replacingItem_other_nonMergingList_mergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingIntList]) === 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([nonMergingList_nonMergingIntList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_name_value_other_mergingList_mergingIntList_retainKeysMergingList]) +=== RUN TestCustomStrategicMergePatch/retainKeys_map_can_delete_a_field_when_no_retainKeys_directive_present/Kind([mergeItemPtr_simpleMap_replacingItem_other_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name_value_mergingList]) === RUN TestCustomStrategicMergePatch/retainKeys_map_can_delete_a_field_when_no_retainKeys_directive_present/Struct === RUN TestCustomStrategicMergePatch/retainKeys_map_merge_an_empty_map === RUN TestCustomStrategicMergePatch/retainKeys_map_merge_an_empty_map/struct -=== RUN TestCustomStrategicMergePatch/retainKeys_map_merge_an_empty_map/Kind([mergeItemPtr_simpleMap_replacingItem_retainKeysMap_nonMergingList_nonMergingIntList_other_mergingList_mergingIntList_retainKeysMergingList_name_value]) +=== RUN TestCustomStrategicMergePatch/retainKeys_map_merge_an_empty_map/Kind([nonMergingList_mergingIntList_mergeItemPtr_simpleMap_replacingItem_other_value_mergingList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name]) === 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([mergingList_mergingIntList_retainKeysMergingList_name_value_other_simpleMap_replacingItem_retainKeysMap_nonMergingList_nonMergingIntList_mergeItemPtr]) +=== RUN TestCustomStrategicMergePatch/retainKeys_list_can_add_a_field_when_no_retainKeys_directive_present/Kind([nonMergingList_mergingIntList_mergeItemPtr_simpleMap_replacingItem_other_value_mergingList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name]) === 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([other_mergingList_mergingIntList_retainKeysMergingList_name_value_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_nonMergingList_nonMergingIntList]) +=== RUN TestCustomStrategicMergePatch/retainKeys_list_can_change_a_field_when_no_retainKeys_directive_present/Kind([simpleMap_replacingItem_other_nonMergingList_mergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_name_value_mergingList_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([nonMergingList_nonMergingIntList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_name_value_other_mergingList_mergingIntList_retainKeysMergingList]) +=== RUN TestCustomStrategicMergePatch/retainKeys_list_can_delete_a_field_when_no_retainKeys_directive_present/Kind([other_nonMergingList_mergingIntList_mergeItemPtr_simpleMap_replacingItem_name_value_mergingList_nonMergingIntList_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([replacingItem_retainKeysMap_nonMergingList_nonMergingIntList_mergeItemPtr_simpleMap_mergingIntList_retainKeysMergingList_name_value_other_mergingList]) +=== RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list/Kind([simpleMap_replacingItem_other_nonMergingList_mergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingIntList]) === 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([retainKeysMap_nonMergingList_nonMergingIntList_mergeItemPtr_simpleMap_replacingItem_retainKeysMergingList_name_value_other_mergingList_mergingIntList]) +=== RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list_2/Kind([nonMergingIntList_retainKeysMap_retainKeysMergingList_name_value_mergingList_mergeItemPtr_simpleMap_replacingItem_other_nonMergingList_mergingIntList]) === 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([mergingList_mergingIntList_retainKeysMergingList_name_value_other_simpleMap_replacingItem_retainKeysMap_nonMergingList_nonMergingIntList_mergeItemPtr]) +=== RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list/Kind([retainKeysMergingList_name_value_mergingList_nonMergingIntList_retainKeysMap_replacingItem_other_nonMergingList_mergingIntList_mergeItemPtr_simpleMap]) === 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([retainKeysMergingList_name_value_other_mergingList_mergingIntList_retainKeysMap_nonMergingList_nonMergingIntList_mergeItemPtr_simpleMap_replacingItem]) +=== RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list#01/Kind([mergeItemPtr_simpleMap_replacingItem_other_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name_value_mergingList]) === RUN TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list#01/Struct ---- PASS: TestCustomStrategicMergePatch (2.98s) - --- PASS: TestCustomStrategicMergePatch/unique_scalars_when_merging_lists (0.14s) +--- PASS: TestCustomStrategicMergePatch (0.74s) + --- PASS: TestCustomStrategicMergePatch/unique_scalars_when_merging_lists (0.03s) --- PASS: TestCustomStrategicMergePatch/unique_scalars_when_merging_lists/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/unique_scalars_when_merging_lists/Kind([nonMergingList_nonMergingIntList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_name_value_other_mergingList_mergingIntList_retainKeysMergingList]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/unique_scalars_when_merging_lists/Kind([other_nonMergingList_mergingIntList_mergeItemPtr_simpleMap_replacingItem_name_value_mergingList_nonMergingIntList_retainKeysMap_retainKeysMergingList]) (0.00s) --- PASS: TestCustomStrategicMergePatch/unique_scalars_when_merging_lists/Struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/delete_map_from_nested_map (0.13s) + --- PASS: TestCustomStrategicMergePatch/delete_map_from_nested_map (0.04s) --- PASS: TestCustomStrategicMergePatch/delete_map_from_nested_map/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/delete_map_from_nested_map/Kind([nonMergingList_nonMergingIntList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_name_value_other_mergingList_mergingIntList_retainKeysMergingList]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/delete_map_from_nested_map/Kind([other_nonMergingList_mergingIntList_mergeItemPtr_simpleMap_replacingItem_name_value_mergingList_nonMergingIntList_retainKeysMap_retainKeysMergingList]) (0.00s) --- PASS: TestCustomStrategicMergePatch/delete_map_from_nested_map/Struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/delete_all_items_from_merging_list (0.19s) + --- PASS: TestCustomStrategicMergePatch/delete_all_items_from_merging_list (0.05s) --- PASS: TestCustomStrategicMergePatch/delete_all_items_from_merging_list/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/delete_all_items_from_merging_list/Kind([mergingList_mergingIntList_retainKeysMergingList_name_value_other_simpleMap_replacingItem_retainKeysMap_nonMergingList_nonMergingIntList_mergeItemPtr]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/delete_all_items_from_merging_list/Kind([other_nonMergingList_mergingIntList_mergeItemPtr_simpleMap_replacingItem_name_value_mergingList_nonMergingIntList_retainKeysMap_retainKeysMergingList]) (0.00s) --- PASS: TestCustomStrategicMergePatch/delete_all_items_from_merging_list/Struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/merge_empty_merging_lists (0.15s) + --- PASS: TestCustomStrategicMergePatch/merge_empty_merging_lists (0.04s) --- PASS: TestCustomStrategicMergePatch/merge_empty_merging_lists/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/merge_empty_merging_lists/Kind([simpleMap_replacingItem_retainKeysMap_nonMergingList_nonMergingIntList_mergeItemPtr_mergingList_mergingIntList_retainKeysMergingList_name_value_other]) (0.01s) + --- PASS: TestCustomStrategicMergePatch/merge_empty_merging_lists/Kind([other_nonMergingList_mergingIntList_mergeItemPtr_simpleMap_replacingItem_name_value_mergingList_nonMergingIntList_retainKeysMap_retainKeysMergingList]) (0.00s) --- PASS: TestCustomStrategicMergePatch/merge_empty_merging_lists/Struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/delete_all_keys_from_map (0.09s) + --- PASS: TestCustomStrategicMergePatch/delete_all_keys_from_map (0.03s) --- PASS: TestCustomStrategicMergePatch/delete_all_keys_from_map/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/delete_all_keys_from_map/Kind([value_other_mergingList_mergingIntList_retainKeysMergingList_name_nonMergingIntList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_nonMergingList]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/delete_all_keys_from_map/Kind([replacingItem_other_nonMergingList_mergingIntList_mergeItemPtr_simpleMap_retainKeysMergingList_name_value_mergingList_nonMergingIntList_retainKeysMap]) (0.00s) --- PASS: TestCustomStrategicMergePatch/delete_all_keys_from_map/Struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/add_key_and_delete_all_keys_from_map (0.08s) + --- PASS: TestCustomStrategicMergePatch/add_key_and_delete_all_keys_from_map (0.03s) --- PASS: TestCustomStrategicMergePatch/add_key_and_delete_all_keys_from_map/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/add_key_and_delete_all_keys_from_map/Kind([other_mergingList_mergingIntList_retainKeysMergingList_name_value_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_nonMergingList_nonMergingIntList]) (0.00s) - --- PASS: TestCustomStrategicMergePatch/add_key_and_delete_all_keys_from_map/Struct (0.01s) - --- PASS: TestCustomStrategicMergePatch/delete_all_duplicate_entries_in_a_merging_list (0.12s) - --- PASS: TestCustomStrategicMergePatch/delete_all_duplicate_entries_in_a_merging_list/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/delete_all_duplicate_entries_in_a_merging_list/Kind([name_value_other_mergingList_mergingIntList_retainKeysMergingList_nonMergingList_nonMergingIntList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap]) (0.00s) - --- PASS: TestCustomStrategicMergePatch/delete_all_duplicate_entries_in_a_merging_list/Struct (0.01s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_add_a_field_when_no_retainKeys_directive_present (0.15s) + --- PASS: TestCustomStrategicMergePatch/add_key_and_delete_all_keys_from_map/Kind([retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingIntList_simpleMap_replacingItem_other_nonMergingList_mergingIntList_mergeItemPtr]) (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/struct (0.01s) + --- PASS: TestCustomStrategicMergePatch/delete_all_duplicate_entries_in_a_merging_list/Kind([simpleMap_replacingItem_other_nonMergingList_mergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingIntList]) (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.05s) --- 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([nonMergingList_nonMergingIntList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_name_value_other_mergingList_mergingIntList_retainKeysMergingList]) (0.01s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_add_a_field_when_no_retainKeys_directive_present/Kind([mergingIntList_mergeItemPtr_simpleMap_replacingItem_other_nonMergingList_mergingList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name_value]) (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.18s) + --- 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/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_change_a_field_when_no_retainKeys_directive_present/Kind([nonMergingList_nonMergingIntList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_name_value_other_mergingList_mergingIntList_retainKeysMergingList]) (0.00s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_change_a_field_when_no_retainKeys_directive_present/Struct (0.01s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_delete_a_field_when_no_retainKeys_directive_present (0.21s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_delete_a_field_when_no_retainKeys_directive_present/struct (0.01s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_delete_a_field_when_no_retainKeys_directive_present/Kind([nonMergingList_nonMergingIntList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_name_value_other_mergingList_mergingIntList_retainKeysMergingList]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_map_can_change_a_field_when_no_retainKeys_directive_present/Kind([simpleMap_replacingItem_other_nonMergingList_mergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingIntList]) (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.03s) + --- 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([mergeItemPtr_simpleMap_replacingItem_other_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name_value_mergingList]) (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.15s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_map_merge_an_empty_map/struct (0.01s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_map_merge_an_empty_map/Kind([mergeItemPtr_simpleMap_replacingItem_retainKeysMap_nonMergingList_nonMergingIntList_other_mergingList_mergingIntList_retainKeysMergingList_name_value]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_map_merge_an_empty_map (0.03s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_map_merge_an_empty_map/struct (0.00s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_map_merge_an_empty_map/Kind([nonMergingList_mergingIntList_mergeItemPtr_simpleMap_replacingItem_other_value_mergingList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name]) (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.16s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_add_a_field_when_no_retainKeys_directive_present (0.04s) --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_add_a_field_when_no_retainKeys_directive_present/struct (0.01s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_add_a_field_when_no_retainKeys_directive_present/Kind([mergingList_mergingIntList_retainKeysMergingList_name_value_other_simpleMap_replacingItem_retainKeysMap_nonMergingList_nonMergingIntList_mergeItemPtr]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_add_a_field_when_no_retainKeys_directive_present/Kind([nonMergingList_mergingIntList_mergeItemPtr_simpleMap_replacingItem_other_value_mergingList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name]) (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.22s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_change_a_field_when_no_retainKeys_directive_present/struct (0.01s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_change_a_field_when_no_retainKeys_directive_present/Kind([other_mergingList_mergingIntList_retainKeysMergingList_name_value_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_nonMergingList_nonMergingIntList]) (0.00s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_change_a_field_when_no_retainKeys_directive_present/Struct (0.01s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_delete_a_field_when_no_retainKeys_directive_present (0.16s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_change_a_field_when_no_retainKeys_directive_present (0.04s) + --- 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([simpleMap_replacingItem_other_nonMergingList_mergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_name_value_mergingList_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.04s) --- 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([nonMergingList_nonMergingIntList_mergeItemPtr_simpleMap_replacingItem_retainKeysMap_name_value_other_mergingList_mergingIntList_retainKeysMergingList]) (0.00s) - --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_delete_a_field_when_no_retainKeys_directive_present/Struct (0.01s) - --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list (0.12s) + --- PASS: TestCustomStrategicMergePatch/retainKeys_list_can_delete_a_field_when_no_retainKeys_directive_present/Kind([other_nonMergingList_mergingIntList_mergeItemPtr_simpleMap_replacingItem_name_value_mergingList_nonMergingIntList_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/struct (0.00s) - --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list/Kind([replacingItem_retainKeysMap_nonMergingList_nonMergingIntList_mergeItemPtr_simpleMap_mergingIntList_retainKeysMergingList_name_value_other_mergingList]) (0.01s) - --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list/Struct (0.01s) - --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list_2 (0.13s) + --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list/Kind([simpleMap_replacingItem_other_nonMergingList_mergingIntList_mergeItemPtr_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingIntList]) (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_2 (0.03s) --- 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([retainKeysMap_nonMergingList_nonMergingIntList_mergeItemPtr_simpleMap_replacingItem_retainKeysMergingList_name_value_other_mergingList_mergingIntList]) (0.00s) - --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list_2/Struct (0.01s) - --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list (0.21s) + --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_list_2/Kind([nonMergingIntList_retainKeysMap_retainKeysMergingList_name_value_mergingList_mergeItemPtr_simpleMap_replacingItem_other_nonMergingList_mergingIntList]) (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.07s) --- 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([mergingList_mergingIntList_retainKeysMergingList_name_value_other_simpleMap_replacingItem_retainKeysMap_nonMergingList_nonMergingIntList_mergeItemPtr]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list/Kind([retainKeysMergingList_name_value_mergingList_nonMergingIntList_retainKeysMap_replacingItem_other_nonMergingList_mergingIntList_mergeItemPtr_simpleMap]) (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.23s) + --- 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([retainKeysMergingList_name_value_other_mergingList_mergingIntList_retainKeysMap_nonMergingList_nonMergingIntList_mergeItemPtr_simpleMap_replacingItem]) (0.00s) + --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list#01/Kind([mergeItemPtr_simpleMap_replacingItem_other_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name_value_mergingList]) (0.00s) --- PASS: TestCustomStrategicMergePatch/preserve_the_order_from_the_patch_in_a_merging_int_list#01/Struct (0.00s) === RUN TestStrategicMergePatch === RUN TestStrategicMergePatch/struct @@ -8356,51 +8395,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([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList]) -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/nil_original/TwoWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/nil_original/ThreeWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/nil_patch/TwoWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/nil_patch/ThreeWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/add_field_to_map/TwoWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/add_field_to_map/ThreeWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/add_field_to_map_with_conflict/TwoWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/add_field_to_map_with_conflict/ThreeWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/add_field_and_delete_field_from_map/TwoWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/add_field_and_delete_field_from_map/ThreeWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/add_field_and_delete_field_from_map_with_conflict/TwoWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/add_field_and_delete_field_from_map_with_conflict/ThreeWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_field_from_nested_map/TwoWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_field_from_nested_map/ThreeWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_field_from_nested_map_with_conflict/TwoWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_field_from_nested_map_with_conflict/ThreeWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_all_fields_from_map/TwoWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_all_fields_from_map/ThreeWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_all_fields_from_map_with_conflict/TwoWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_all_fields_from_map_with_conflict/ThreeWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/add_field_and_delete_all_fields_from_map/TwoWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/add_field_and_delete_all_fields_from_map/ThreeWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/add_field_and_delete_all_fields_from_map_with_conflict/TwoWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/add_field_and_delete_all_fields_from_map_with_conflict/ThreeWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/replace_list_of_scalars/TwoWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/replace_list_of_scalars/ThreeWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/replace_list_of_scalars_with_conflict/TwoWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/replace_list_of_scalars_with_conflict/ThreeWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_all_maps_from_merging_list/TwoWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_all_maps_from_merging_list/ThreeWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_all_maps_from_merging_list_with_conflict/TwoWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_all_maps_from_merging_list_with_conflict/ThreeWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_all_maps_from_empty_merging_list/TwoWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_all_maps_from_empty_merging_list/ThreeWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/merge_empty_merging_lists/TwoWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/merge_empty_merging_lists/ThreeWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/TwoWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/ThreeWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/defined_null_values_should_propagate_removing_original_fields/TwoWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/defined_null_values_should_propagate_removing_original_fields/ThreeWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/nil_patch_with_retainKeys_map/TwoWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/nil_patch_with_retainKeys_map/ThreeWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/retainKeys_map_with_no_change_should_not_be_present/TwoWay -=== RUN TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/retainKeys_map_with_no_change_should_not_be_present/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap]) +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/nil_original/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/nil_original/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/nil_patch/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/nil_patch/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/add_field_to_map/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/add_field_to_map/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/add_field_to_map_with_conflict/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/add_field_to_map_with_conflict/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/add_field_and_delete_field_from_map/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/add_field_and_delete_field_from_map/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/add_field_and_delete_field_from_map_with_conflict/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/add_field_and_delete_field_from_map_with_conflict/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_field_from_nested_map/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_field_from_nested_map/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_field_from_nested_map_with_conflict/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_field_from_nested_map_with_conflict/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_all_fields_from_map/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_all_fields_from_map/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_all_fields_from_map_with_conflict/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_all_fields_from_map_with_conflict/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/add_field_and_delete_all_fields_from_map/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/add_field_and_delete_all_fields_from_map/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/add_field_and_delete_all_fields_from_map_with_conflict/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/add_field_and_delete_all_fields_from_map_with_conflict/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/replace_list_of_scalars/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/replace_list_of_scalars/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/replace_list_of_scalars_with_conflict/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/replace_list_of_scalars_with_conflict/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_all_maps_from_merging_list/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_all_maps_from_merging_list/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_all_maps_from_merging_list_with_conflict/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_all_maps_from_merging_list_with_conflict/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_all_maps_from_empty_merging_list/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_all_maps_from_empty_merging_list/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/merge_empty_merging_lists/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/merge_empty_merging_lists/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/defined_null_values_should_propagate_removing_original_fields/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/defined_null_values_should_propagate_removing_original_fields/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/nil_patch_with_retainKeys_map/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/nil_patch_with_retainKeys_map/ThreeWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/retainKeys_map_with_no_change_should_not_be_present/TwoWay +=== RUN TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_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 @@ -12206,364 +12245,364 @@ === 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 (55.43s) - --- PASS: TestStrategicMergePatch/struct (0.30s) +--- PASS: TestStrategicMergePatch (18.68s) + --- PASS: TestStrategicMergePatch/struct (0.05s) --- PASS: TestStrategicMergePatch/struct/nil_original/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/struct/nil_original/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/struct/nil_original/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/struct/nil_patch/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/struct/nil_patch/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/struct/add_field_to_map/TwoWay (0.01s) + --- 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) --- PASS: TestStrategicMergePatch/struct/add_field_and_delete_field_from_map_with_conflict/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/struct/delete_field_from_nested_map/TwoWay (0.01s) + --- PASS: TestStrategicMergePatch/struct/delete_field_from_nested_map/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/struct/delete_field_from_nested_map/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/struct/delete_field_from_nested_map_with_conflict/TwoWay (0.01s) + --- PASS: TestStrategicMergePatch/struct/delete_field_from_nested_map_with_conflict/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/struct/delete_field_from_nested_map_with_conflict/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/struct/delete_all_fields_from_map/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/struct/delete_all_fields_from_map/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/struct/delete_all_fields_from_map_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/struct/delete_all_fields_from_map_with_conflict/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.01s) + --- PASS: TestStrategicMergePatch/struct/add_field_and_delete_all_fields_from_map_with_conflict/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/struct/add_field_and_delete_all_fields_from_map_with_conflict/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/struct/replace_list_of_scalars/TwoWay (0.01s) + --- PASS: TestStrategicMergePatch/struct/replace_list_of_scalars/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/struct/replace_list_of_scalars/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/struct/replace_list_of_scalars_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/struct/replace_list_of_scalars_with_conflict/ThreeWay (0.01s) + --- 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.03s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/struct/delete_all_maps_from_empty_merging_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/struct/merge_empty_merging_lists/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/struct/merge_empty_merging_lists/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/struct/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/struct/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/struct/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/struct/defined_null_values_should_propagate_removing_original_fields/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/struct/defined_null_values_should_propagate_removing_original_fields/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/struct/nil_patch_with_retainKeys_map/TwoWay (0.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/struct/retainKeys_map_with_no_change_should_not_be_present/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/struct/retainKeys_map_with_no_change_should_not_be_present/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay (0.00s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay (0.01s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay (0.02s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay (0.02s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay (0.02s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay (0.03s) + --- 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_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay (0.02s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay (0.03s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay (0.02s) + --- 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.02s) --- 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.02s) + --- 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.01s) - --- 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.03s) + --- 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.02s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay (0.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay (0.02s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay (0.02s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay (0.00s) --- 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.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay (0.03s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay (0.02s) + --- 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/replace_non_merging_list_nested_in_merging_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay (0.01s) - --- 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.02s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay (0.01s) + --- 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.01s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#01 (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.02s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay (0.01s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay (0.01s) - --- 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.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay (0.03s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay (0.01s) + --- 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.02s) + --- 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.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) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay (0.01s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay (0.02s) + --- 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.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.02s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay (0.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay (0.01s) + --- 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/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.02s) + --- 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.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay (0.02s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay (0.00s) + --- 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.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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay (0.02s) --- 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.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay (0.01s) + --- 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/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay (0.01s) - --- 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.01s) + --- 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.01s) + --- 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_with_server-only_items/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay (0.02s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay (0.01s) - --- 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/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.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.01s) - --- 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/ThreeWay (0.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/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.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.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay (0.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/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/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/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.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_with_conflict/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay (0.01s) + --- 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.01s) + --- 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/ThreeWay (0.01s) --- 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.01s) + --- 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.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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay (0.01s) - --- 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_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/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.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay (0.01s) + --- 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.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.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay (0.02s) - --- 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.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay (0.01s) --- 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.01s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay (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.02s) + --- 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/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.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/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay (0.01s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/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_all_duplicate_items_in_lists_of_scalars/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#01 (0.01s) + --- 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/merge_lists_of_maps/TwoWay#01 (0.02s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#01 (0.03s) + --- 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.03s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#02 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#02 (0.02s) + --- 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.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#01 (0.04s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#01 (0.02s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#01 (0.00s) + --- 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/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.02s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#01 (0.01s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#01 (0.00s) --- 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.02s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#01 (0.02s) + --- 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/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.01s) + --- 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/delete_field_from_map_in_merging_list/TwoWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#01 (0.03s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#01 (0.03s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#01 (0.01s) + --- 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.01s) - --- 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.02s) - --- 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.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#01 (0.00s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#01 (0.02s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#01 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#01 (0.02s) - --- 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.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#03 (0.01s) - --- 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/ThreeWay#01 (0.00s) + --- 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_deletion_conflict/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#03 (0.01s) --- PASS: TestStrategicMergePatch/add_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_with_conflict/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#01 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#01 (0.05s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/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.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#01 (0.01s) --- 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.02s) + --- 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.01s) + --- 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.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#01 (0.03s) - --- 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.02s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#01 (0.01s) + --- 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.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.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#01 (0.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#01 (0.05s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#01 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#01 (0.00s) - --- 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.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#01 (0.03s) + --- 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/ThreeWay#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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#01 (0.01s) --- 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.01s) + --- 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.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.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#01 (0.02s) + --- 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_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.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#01 (0.02s) + --- 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/ThreeWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#01 (0.01s) + --- 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.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#01 (0.00s) @@ -12571,745 +12610,745 @@ --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#01 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#01 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#01 (0.00s) + --- 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_changes_a_field_in_a_nested_map/TwoWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#01 (0.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#01 (0.02s) + --- 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.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.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#01 (0.00s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#01 (0.01s) + --- 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) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#01 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#01 (0.03s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#01 (0.00s) + --- 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.01s) - --- 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.01s) + --- 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.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#01 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#01 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#01 (0.01s) + --- 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.02s) --- 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.01s) + --- 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.01s) + --- 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.01s) + --- 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.03s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#01 (0.01s) --- 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/ThreeWay#01 (0.02s) --- 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.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#01 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#01 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#01 (0.02s) --- 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_deletes_a_field/TwoWay#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.01s) --- 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.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.02s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#02 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#02 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#04 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#04 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#05 (0.01s) + --- 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) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#02 (0.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#02 (0.01s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#02 (0.03s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#02 (0.02s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#02 (0.00s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#02 (0.03s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#02 (0.02s) - --- 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.02s) + --- 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.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/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.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#02 (0.02s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#02 (0.02s) + --- 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) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#02 (0.02s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#02 (0.02s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#02 (0.02s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#02 (0.02s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#02 (0.01s) - --- 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/ThreeWay#02 (0.02s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#02 (0.03s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#02 (0.06s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#02 (0.02s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#02 (0.03s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#02 (0.01s) + --- 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.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.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#02 (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.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#04 (0.05s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#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_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.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.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#02 (0.01s) --- 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.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#02 (0.01s) + --- 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/ThreeWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#02 (0.01s) + --- 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/merge_lists_of_scalars/TwoWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#02 (0.00s) --- 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.01s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#02 (0.01s) + --- 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/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_multiple_items_in_a_list_and_preserve_order/TwoWay#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.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#02 (0.01s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#02 (0.01s) --- 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.01s) - --- 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/ThreeWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#02 (0.01s) + --- 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.01s) --- 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.01s) - --- 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.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#02 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/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.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_2/TwoWay#02 (0.02s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#02 (0.01s) + --- 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/ThreeWay#02 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#02 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#02 (0.01s) + --- 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.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#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/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.01s) --- 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/ThreeWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/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.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.01s) - --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#02 (0.00s) --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#02 (0.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#02 (0.01s) + --- 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.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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#02 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#02 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#02 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#02 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#02 (0.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.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#02 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#02 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#02 (0.00s) --- 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.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#02 (0.01s) --- 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.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.04s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#02 (0.01s) + --- 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/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.01s) + --- 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.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#03 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#03 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#03 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#03 (0.01s) + --- 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.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#06 (0.00s) --- 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.01s) + --- 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_duplicate_field_to_map_in_merging_list/TwoWay#03 (0.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#03 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/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.01s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#03 (0.01s) + --- 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.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.01s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#03 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#03 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#03 (0.01s) - --- 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.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#03 (0.01s) + --- 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.00s) + --- 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.01s) + --- 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/ThreeWay#03 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#03 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#03 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#03 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#03 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#03 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/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_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.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#03 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#03 (0.01s) + --- 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/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.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#03 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#03 (0.03s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#03 (0.03s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#03 (0.03s) - --- 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.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#07 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#07 (0.02s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#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.01s) + --- 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.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.01s) --- 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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#03 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#03 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#03 (0.00s) + --- 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) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#03 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#03 (0.01s) --- 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.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#03 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#03 (0.01s) + --- 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.01s) + --- 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.01s) - --- 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/ThreeWay#03 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_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.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#03 (0.01s) + --- 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_2/TwoWay#03 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#03 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#03 (0.03s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#03 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#03 (0.02s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#03 (0.02s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#03 (0.02s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#03 (0.01s) - --- 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.02s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#03 (0.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#03 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#03 (0.03s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#03 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#03 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#03 (0.02s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#03 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#03 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#03 (0.03s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#03 (0.01s) + --- 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.01s) - --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#03 (0.01s) + --- 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/ThreeWay#03 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_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.01s) --- 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.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#03 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#03 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#03 (0.02s) + --- 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.03s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#03 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#03 (0.02s) + --- 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_nested_merging_int_list_with_no_change/ThreeWay#03 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#03 (0.01s) + --- 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.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/TwoWay#03 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#03 (0.00s) --- 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.02s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#03 (0.01s) - --- 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.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#03 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#03 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#03 (0.02s) + --- 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_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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#03 (0.01s) + --- 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/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.03s) + --- 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.03s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#03 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#03 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#03 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#03 (0.02s) + --- 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_adds_a_field/TwoWay#03 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#03 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#03 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#03 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#03 (0.02s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#03 (0.01s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#03 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#03 (0.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#03 (0.00s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#03 (0.01s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#04 (0.02s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#04 (0.02s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#04 (0.01s) + --- 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/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.02s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#04 (0.03s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#04 (0.01s) - --- 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/add_and_delete_items_in_lists_of_scalars/TwoWay#04 (0.02s) + --- 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.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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#09 (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.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#04 (0.03s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#04 (0.01s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#04 (0.02s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#04 (0.01s) - --- 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.02s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#04 (0.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.03s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#04 (0.01s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/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.01s) + --- 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.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.01s) --- 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.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#04 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#04 (0.02s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#04 (0.01s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#04 (0.01s) - --- 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.02s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#04 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#04 (0.01s) - --- 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.03s) - --- 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.02s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#04 (0.02s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#04 (0.03s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#04 (0.02s) - --- 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.02s) - --- 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.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#04 (0.03s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#08 (0.04s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#08 (0.06s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#09 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#09 (0.03s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#04 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/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.01s) + --- 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.02s) + --- 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.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.01s) + --- 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/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#04 (0.01s) + --- 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/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.02s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#04 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#04 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#04 (0.05s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#04 (0.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.02s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#04 (0.02s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#04 (0.02s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#04 (0.01s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#04 (0.02s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#04 (0.02s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#04 (0.02s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#04 (0.02s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#04 (0.02s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#04 (0.01s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#04 (0.03s) + --- 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.01s) + --- 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.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.02s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#04 (0.02s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#04 (0.02s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#04 (0.03s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#04 (0.02s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#04 (0.02s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#04 (0.02s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#04 (0.01s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#04 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#04 (0.02s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#04 (0.00s) --- 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.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.01s) + --- 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.03s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#04 (0.02s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#04 (0.01s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#04 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#04 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#04 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#04 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#04 (0.05s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#04 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#04 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#04 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#04 (0.01s) + --- 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/ThreeWay#04 (0.03s) + --- 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.02s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#04 (0.02s) + --- 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.02s) --- 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.02s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#04 (0.01s) + --- 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.02s) --- 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/ThreeWay#04 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#04 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#04 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#04 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#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/ThreeWay#04 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#04 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#04 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#04 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#04 (0.02s) - --- 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.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#04 (0.00s) + --- 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.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#04 (0.02s) --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#04 (0.02s) + --- 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.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.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#04 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#04 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#04 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#04 (0.01s) + --- 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.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.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#04 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#04 (0.04s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#04 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#04 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#04 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#04 (0.03s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#04 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#04 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#04 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#04 (0.00s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#04 (0.05s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#04 (0.01s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#05 (0.03s) - --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#05 (0.02s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#05 (0.01s) --- 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/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.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#05 (0.02s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#05 (0.02s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#05 (0.03s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#05 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#05 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#11 (0.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#05 (0.02s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#05 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#05 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#05 (0.04s) + --- 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.02s) --- 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) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#05 (0.03s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#05 (0.01s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#05 (0.01s) + --- 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.02s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#05 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#05 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#05 (0.01s) + --- 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) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#05 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#05 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#05 (0.01s) + --- 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.02s) --- 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.02s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#05 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#05 (0.02s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#05 (0.01s) --- 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.02s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#05 (0.02s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#05 (0.02s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#05 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#05 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#05 (0.01s) + --- 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_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.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/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_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.01s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#05 (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_map_to_merging_list_by_pointer/TwoWay#05 (0.01s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#05 (0.02s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#05 (0.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#05 (0.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.02s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#05 (0.07s) + --- 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/ThreeWay#05 (0.01s) + --- 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/ThreeWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#05 (0.02s) --- 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.01s) + --- 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/set_elements_order_in_a_list/TwoWay#05 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#05 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#05 (0.01s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#05 (0.01s) + --- 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.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.01s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#05 (0.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#05 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#05 (0.02s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#05 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#05 (0.02s) --- 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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#05 (0.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/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.02s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#05 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#05 (0.00s) @@ -13317,275 +13356,275 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#05 (0.01s) --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#05 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#05 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#05 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#05 (0.01s) + --- 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.02s) --- 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.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) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#05 (0.01s) - --- 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_with_conflict/TwoWay#05 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#05 (0.03s) + --- 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) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#05 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#05 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#05 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#05 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#05 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#05 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#05 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#05 (0.01s) --- 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.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#05 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#05 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/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) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#05 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#05 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#05 (0.03s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#05 (0.01s) + --- 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_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.02s) --- 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.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#05 (0.01s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#05 (0.01s) + --- 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/ThreeWay#05 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#05 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#05 (0.02s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#05 (0.02s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#05 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#05 (0.01s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#05 (0.01s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#05 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#06 (0.01s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#06 (0.01s) + --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#06 (0.01s) + --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#06 (0.01s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#06 (0.02s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#06 (0.02s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#06 (0.03s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#12 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#13 (0.02s) + --- 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.01s) + --- 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.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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#06 (0.02s) + --- 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.02s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#06 (0.02s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#06 (0.02s) - --- 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.02s) - --- 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/ThreeWay#06 (0.04s) + --- 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.00s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#06 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#06 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#06 (0.03s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#06 (0.02s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#06 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#06 (0.00s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#06 (0.03s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#06 (0.02s) + --- 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.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.01s) --- 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.08s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#06 (0.02s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#06 (0.03s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#06 (0.02s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#06 (0.00s) + --- 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.02s) + --- 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/replace_non_merging_list_nested_in_merging_list/TwoWay#06 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#06 (0.01s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#06 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#06 (0.03s) - --- 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.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#13 (0.01s) - --- 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.02s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#06 (0.03s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#06 (0.02s) + --- 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/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_map_to_merging_list_by_pointer/TwoWay#06 (0.01s) + --- 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_field_to_map_in_merging_list_by_pointer/TwoWay#06 (0.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#06 (0.04s) + --- 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.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#06 (0.02s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#06 (0.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#06 (0.01s) + --- 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/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#06 (0.01s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#06 (0.02s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#06 (0.02s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#06 (0.02s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#06 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#06 (0.01s) + --- 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.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/ThreeWay#06 (0.02s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#06 (0.02s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#06 (0.03s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#06 (0.03s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#06 (0.03s) + --- 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.02s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#06 (0.01s) --- 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.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#06 (0.01s) + --- 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/ThreeWay#06 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#06 (0.01s) + --- 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.04s) --- 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.01s) - --- 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/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/ThreeWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#06 (0.01s) - --- 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.02s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#06 (0.02s) + --- 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/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.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#06 (0.01s) + --- 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) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#06 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#06 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#06 (0.02s) + --- 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.01s) + --- 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.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/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.01s) --- 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.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#06 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_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.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#06 (0.02s) --- 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.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#06 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#06 (0.01s) + --- 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.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#06 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#06 (0.01s) + --- 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.02s) --- 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.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#06 (0.03s) + --- 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) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#06 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#06 (0.03s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#06 (0.03s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#06 (0.01s) + --- 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.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#06 (0.01s) + --- 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.02s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_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/ThreeWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#06 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#06 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_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.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#06 (0.07s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#06 (0.01s) - --- 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.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#06 (0.04s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#06 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#06 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#06 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#06 (0.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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#06 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#06 (0.00s) --- 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.02s) + --- 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/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#06 (0.02s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/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.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#07 (0.02s) + --- 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/ThreeWay#07 (0.02s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#07 (0.01s) - --- 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.02s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#07 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#15 (0.01s) + --- 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.02s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#07 (0.00s) @@ -13595,289 +13634,289 @@ --- 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.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#07 (0.00s) --- 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.00s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#07 (0.02s) --- 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.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#07 (0.02s) --- 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.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.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#07 (0.00s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#07 (0.02s) + --- 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/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.02s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#07 (0.02s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#07 (0.03s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#07 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#07 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#07 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#07 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#07 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#07 (0.02s) - --- 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.02s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#07 (0.01s) + --- 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.00s) + --- 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.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#07 (0.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.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#15 (0.04s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#15 (0.00s) --- 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.03s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#07 (0.01s) --- 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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#07 (0.01s) + --- 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_with_conflict/TwoWay#07 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#07 (0.03s) + --- 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/merge_lists_of_scalars/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#07 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#07 (0.01s) + --- 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_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#07 (0.01s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/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.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#07 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#07 (0.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#07 (0.01s) + --- 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/ThreeWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#07 (0.02s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#07 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#07 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#07 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#07 (0.01s) + --- 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_2/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#07 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#07 (0.01s) + --- 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/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.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#07 (0.00s) --- 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.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.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#07 (0.01s) + --- 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.01s) + --- 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.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#07 (0.01s) --- 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.00s) --- 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/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#07 (0.01s) + --- 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.01s) + --- 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.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.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_and_clears_a_field/TwoWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#07 (0.01s) --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#07 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#07 (0.01s) + --- 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_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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#07 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#07 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#07 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#07 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#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.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#07 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/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.01s) --- 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.01s) + --- 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_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.01s) - --- 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.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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#07 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#07 (0.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_deletes_an_item_in_nested_merging_int_list/ThreeWay#07 (0.01s) --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#07 (0.00s) --- 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/TwoWay#07 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#07 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#07 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#07 (0.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.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.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.01s) + --- 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.03s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#07 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#07 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#07 (0.01s) + --- 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.01s) --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#07 (0.00s) --- 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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#07 (0.01s) - --- 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/TwoWay#07 (0.00s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#07 (0.01s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#07 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_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/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.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#08 (0.01s) - --- 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.01s) + --- 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.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#16 (0.01s) + --- 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_with_conflict/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#08 (0.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#08 (0.01s) --- 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/ThreeWay#08 (0.01s) - --- 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/ThreeWay#08 (0.02s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#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.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#08 (0.02s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#08 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#08 (0.02s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#08 (0.01s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#08 (0.02s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#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.02s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#08 (0.03s) + --- 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_missing_field_from_map_in_merging_list/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#08 (0.02s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#08 (0.02s) - --- 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.02s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#08 (0.03s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#08 (0.04s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#08 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#08 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#08 (0.02s) - --- 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.03s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#17 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#17 (0.02s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#08 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#08 (0.01s) + --- 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.01s) + --- 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.00s) + --- 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.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/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_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_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.01s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#08 (0.02s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#08 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#08 (0.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.02s) - --- 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.02s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#08 (0.01s) + --- 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/set_elements_order_in_a_list/TwoWay#08 (0.00s) + --- 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.01s) - --- 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/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#08 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#08 (0.02s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#08 (0.01s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#08 (0.02s) + --- 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.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/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/ThreeWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#08 (0.01s) + --- 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/ThreeWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#08 (0.02s) + --- 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.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.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#08 (0.01s) + --- 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.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#08 (0.00s) @@ -13885,9 +13924,9 @@ --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#08 (0.00s) --- 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_nested_map_with_no_change/ThreeWay#08 (0.01s) --- 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) @@ -13897,175 +13936,175 @@ --- 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_replaces_non-merging_list/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#08 (0.01s) + --- 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.01s) + --- 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.03s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#08 (0.00s) + --- 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.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.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#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.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#08 (0.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.01s) + --- 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.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#08 (0.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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#08 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#08 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#08 (0.03s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#08 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#08 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_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_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.01s) --- 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/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#08 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#08 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#08 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#08 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#08 (0.01s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#09 (0.01s) - --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#09 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#09 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#18 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#19 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#09 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#19 (0.02s) + --- 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_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.01s) --- 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.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#09 (0.00s) --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#09 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#09 (0.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.01s) --- 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/delete_field_from_map_in_merging_list/TwoWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#09 (0.01s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#09 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#09 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#09 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#09 (0.02s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#09 (0.02s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#09 (0.03s) - --- 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.03s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#09 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#09 (0.02s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#09 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#09 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#09 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#09 (0.03s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#18 (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.01s) --- 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.02s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#09 (0.00s) + --- 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.01s) --- 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.01s) + --- 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.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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#09 (0.02s) - --- 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.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#09 (0.00s) --- 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.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#09 (0.01s) + --- 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.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#09 (0.01s) + --- 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.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#09 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#09 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#09 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#09 (0.06s) + --- 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_2/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#09 (0.01s) + --- 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.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#09 (0.01s) --- 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/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/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#09 (0.01s) --- 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_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.01s) + --- 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.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.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#09 (0.01s) + --- 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.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/TwoWay#09 (0.01s) --- 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.00s) + --- 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) @@ -14083,13 +14122,13 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#09 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#09 (0.00s) @@ -14097,17 +14136,17 @@ --- 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.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_adds_an_item_in_nested_merging_int_list/ThreeWay#09 (0.01s) --- 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_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.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#09 (0.01s) --- 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.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#09 (0.01s) --- 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) @@ -14118,564 +14157,564 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#09 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#09 (0.01s) + --- 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.01s) --- 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_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#09 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#09 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#09 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#09 (0.01s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#09 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#09 (0.00s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#09 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#09 (0.01s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList]) (0.30s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/nil_original/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/nil_original/ThreeWay (0.02s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/nil_patch/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/nil_patch/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/add_field_to_map/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/add_field_to_map/ThreeWay (0.02s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/add_field_to_map_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/add_field_to_map_with_conflict/ThreeWay (0.03s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/add_field_and_delete_field_from_map/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/add_field_and_delete_field_from_map/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/add_field_and_delete_field_from_map_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/add_field_and_delete_field_from_map_with_conflict/ThreeWay (0.01s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_field_from_nested_map/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_field_from_nested_map/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_field_from_nested_map_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_field_from_nested_map_with_conflict/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_all_fields_from_map/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_all_fields_from_map/ThreeWay (0.01s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_all_fields_from_map_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_all_fields_from_map_with_conflict/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/add_field_and_delete_all_fields_from_map/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/add_field_and_delete_all_fields_from_map/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/add_field_and_delete_all_fields_from_map_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/add_field_and_delete_all_fields_from_map_with_conflict/ThreeWay (0.01s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/replace_list_of_scalars/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/replace_list_of_scalars/ThreeWay (0.01s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/replace_list_of_scalars_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/replace_list_of_scalars_with_conflict/ThreeWay (0.01s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_all_maps_from_merging_list/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_all_maps_from_merging_list/ThreeWay (0.01s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_all_maps_from_merging_list_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_all_maps_from_merging_list_with_conflict/ThreeWay (0.01s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_all_maps_from_empty_merging_list/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/delete_all_maps_from_empty_merging_list/ThreeWay (0.02s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/merge_empty_merging_lists/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/merge_empty_merging_lists/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/defined_null_values_should_propagate_removing_original_fields/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/defined_null_values_should_propagate_removing_original_fields/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/nil_patch_with_retainKeys_map/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/nil_patch_with_retainKeys_map/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/retainKeys_map_with_no_change_should_not_be_present/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/Kind([other_nonMergingIntList_mergeItemPtr_replacingItem_simpleMap_retainKeysMap_retainKeysMergingList_name_value_mergingList_nonMergingList_mergingIntList])/retainKeys_map_with_no_change_should_not_be_present/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap]) (0.04s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/nil_original/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/nil_original/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/nil_patch/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/nil_patch/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/add_field_to_map/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/add_field_to_map/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/add_field_to_map_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/add_field_to_map_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/add_field_and_delete_field_from_map/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/add_field_and_delete_field_from_map/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/add_field_and_delete_field_from_map_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/add_field_and_delete_field_from_map_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_field_from_nested_map/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_field_from_nested_map/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_field_from_nested_map_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_field_from_nested_map_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_all_fields_from_map/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_all_fields_from_map/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_all_fields_from_map_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_all_fields_from_map_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/add_field_and_delete_all_fields_from_map/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/add_field_and_delete_all_fields_from_map/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/add_field_and_delete_all_fields_from_map_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/add_field_and_delete_all_fields_from_map_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/replace_list_of_scalars/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/replace_list_of_scalars/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/replace_list_of_scalars_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/replace_list_of_scalars_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_all_maps_from_merging_list/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_all_maps_from_merging_list/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_all_maps_from_merging_list_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_all_maps_from_merging_list_with_conflict/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_all_maps_from_empty_merging_list/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/delete_all_maps_from_empty_merging_list/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/merge_empty_merging_lists/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/merge_empty_merging_lists/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/defined_null_values_should_propagate_removing_original_fields/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/defined_null_values_should_propagate_removing_original_fields/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/nil_patch_with_retainKeys_map/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/nil_patch_with_retainKeys_map/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_retainKeysMap])/retainKeys_map_with_no_change_should_not_be_present/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Kind([mergingIntList_nonMergingIntList_simpleMap_name_value_other_mergingList_nonMergingList_replacingItem_retainKeysMergingList_mergeItemPtr_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.02s) - --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#10 (0.01s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#10 (0.02s) + --- 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/ThreeWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#10 (0.02s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#10 (0.03s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#20 (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.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#10 (0.01s) + --- 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.02s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#10 (0.02s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#10 (0.02s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#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.00s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#10 (0.02s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#10 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#10 (0.00s) --- 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.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#10 (0.01s) - --- 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/TwoWay#10 (0.00s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#10 (0.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#10 (0.02s) + --- 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.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#10 (0.02s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/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) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_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/TwoWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#10 (0.01s) - --- 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/ThreeWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#20 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#21 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#21 (0.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_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_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.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.01s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#10 (0.01s) + --- 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.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#10 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#10 (0.03s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#10 (0.01s) + --- 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.01s) + --- 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) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#10 (0.02s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#10 (0.01s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#10 (0.02s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#10 (0.02s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#10 (0.02s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#10 (0.02s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#10 (0.02s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#10 (0.02s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#10 (0.02s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#10 (0.04s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#10 (0.02s) + --- 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.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#10 (0.01s) + --- 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.00s) --- 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_2/ThreeWay#10 (0.02s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#10 (0.01s) --- 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.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#10 (0.00s) --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#10 (0.01s) + --- 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) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#10 (0.00s) --- 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.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#10 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#10 (0.02s) + --- 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.01s) - --- 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.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#10 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#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.01s) --- 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.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#10 (0.01s) + --- 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.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#10 (0.01s) + --- 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.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.03s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#10 (0.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#10 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#10 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#10 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#10 (0.00s) --- 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.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#10 (0.00s) --- 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.01s) - --- 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.01s) + --- 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.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#10 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#10 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#10 (0.01s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#10 (0.01s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#10 (0.00s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#10 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/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.01s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#11 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#11 (0.01s) - --- 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/add_field_to_map_in_merging_list/TwoWay#22 (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/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.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.01s) --- 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_with_conflict/ThreeWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#11 (0.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#11 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#11 (0.01s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#11 (0.02s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/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.03s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#11 (0.01s) + --- 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.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.04s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#11 (0.01s) + --- 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.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.03s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#11 (0.02s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#11 (0.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/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#11 (0.01s) - --- 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/TwoWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#11 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#11 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#22 (0.01s) - --- 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/TwoWay#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.01s) + --- 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_with_conflict/TwoWay#11 (0.01s) + --- 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/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) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#11 (0.00s) --- 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.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#11 (0.01s) + --- 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) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#11 (0.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#11 (0.04s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#11 (0.01s) --- 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.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#11 (0.02s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#11 (0.01s) + --- 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_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.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.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#11 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#11 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#11 (0.01s) + --- 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.01s) - --- 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/TwoWay#11 (0.00s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#11 (0.01s) + --- 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.01s) --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/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.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#11 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#11 (0.01s) + --- 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.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.01s) --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#11 (0.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/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.01s) --- 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_adds_an_item_in_nested_merging_list/TwoWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#11 (0.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.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/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.03s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#11 (0.02s) + --- 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.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#11 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#11 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#11 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#11 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#11 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#11 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#11 (0.00s) --- 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/ThreeWay#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.01s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#11 (0.01s) + --- 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.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#11 (0.01s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#12 (0.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#12 (0.00s) --- 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.01s) + --- 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.01s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#12 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#12 (0.02s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#12 (0.00s) --- 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/ThreeWay#24 (0.01s) --- 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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#12 (0.01s) + --- 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.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#12 (0.01s) --- 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.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#12 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#12 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#12 (0.00s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#12 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#12 (0.00s) --- 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.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#12 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#12 (0.01s) + --- 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_with_conflict/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#12 (0.03s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#12 (0.02s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#12 (0.02s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#12 (0.01s) + --- 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.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/replace_non_merging_list_nested_in_merging_list/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#12 (0.01s) - --- 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_deletion_conflict/TwoWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#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.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#12 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#12 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#12 (0.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.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#12 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#12 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#24 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#25 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#25 (0.03s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#12 (0.01s) + --- 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.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.01s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#12 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#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.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/TwoWay#12 (0.02s) --- 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.01s) + --- 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.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#12 (0.01s) + --- 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.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.01s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#12 (0.02s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#12 (0.02s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#12 (0.01s) + --- 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.02s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#12 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#12 (0.01s) - --- 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_2/ThreeWay#12 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#12 (0.01s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#12 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#12 (0.01s) + --- 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.01s) + --- 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_3/TwoWay#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.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#12 (0.00s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#12 (0.00s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#12 (0.00s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#12 (0.00s) --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#12 (0.01s) + --- 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) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#12 (0.00s) --- 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/TwoWay#12 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#12 (0.00s) @@ -14683,206 +14722,206 @@ --- 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.00s) - --- 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/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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#12 (0.01s) + --- 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_deletes_nested_non-merging_list/TwoWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#12 (0.02s) + --- 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.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#12 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/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/TwoWay#12 (0.01s) --- 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.00s) --- 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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#12 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#12 (0.02s) --- 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/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) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#12 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#12 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#12 (0.00s) --- 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.01s) - --- 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.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#12 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#12 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#12 (0.02s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#12 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#12 (0.01s) - --- 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/ThreeWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#12 (0.01s) + --- 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/ThreeWay#12 (0.00s) + --- 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_and_clear_a_field/TwoWay#12 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#12 (0.01s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#12 (0.01s) + --- 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.01s) --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#13 (0.01s) + --- 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.02s) --- 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.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#13 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#13 (0.02s) + --- 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.01s) - --- 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.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#27 (0.00s) - --- 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.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_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.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#13 (0.01s) + --- 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.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.01s) --- 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.01s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#13 (0.02s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#13 (0.00s) + --- 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.01s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#13 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#13 (0.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#13 (0.02s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#13 (0.01s) + --- 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.03s) + --- 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/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.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#13 (0.02s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#13 (0.01s) + --- 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.02s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#13 (0.00s) + --- 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.01s) + --- 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_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.01s) --- 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/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#13 (0.03s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_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_with_value_conflict/ThreeWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#26 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#27 (0.02s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#13 (0.01s) + --- 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.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.01s) - --- 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.02s) + --- 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.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#13 (0.01s) + --- 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_duplicate_field_to_map_in_merging_int_list/ThreeWay#13 (0.01s) + --- 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.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#13 (0.01s) + --- 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.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/change_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/TwoWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#13 (0.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#13 (0.01s) - --- 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.01s) + --- 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.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#13 (0.01s) + --- 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.00s) + --- 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.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#13 (0.01s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_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.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#13 (0.01s) + --- 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.01s) - --- 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/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.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.01s) - --- 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/ThreeWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#13 (0.01s) + --- 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.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.01s) --- 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.01s) - --- 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.01s) + --- 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.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#13 (0.01s) + --- 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_deletes_a_field/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#13 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#13 (0.01s) + --- 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.02s) --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#13 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#13 (0.00s) --- 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) @@ -14893,518 +14932,518 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#13 (0.01s) --- 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.01s) + --- 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.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#13 (0.01s) --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#13 (0.02s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#13 (0.01s) + --- 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.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.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.01s) --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#13 (0.01s) + --- 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.03s) + --- 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.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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_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_and_clear_a_field/TwoWay#13 (0.00s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#13 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#13 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#13 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#13 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#13 (0.00s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#13 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#14 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#14 (0.00s) + --- 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/ThreeWay#14 (0.04s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#29 (0.01s) --- 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.01s) - --- 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/TwoWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#14 (0.01s) - --- 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.02s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#14 (0.01s) + --- 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.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#14 (0.01s) + --- 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.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.02s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#14 (0.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#14 (0.02s) --- 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/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#14 (0.02s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#14 (0.01s) + --- 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/ThreeWay#14 (0.02s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#14 (0.02s) + --- 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.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#14 (0.02s) --- 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.02s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#14 (0.02s) --- 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.02s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#14 (0.01s) + --- 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.01s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#14 (0.03s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#14 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#14 (0.01s) + --- 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.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.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#14 (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.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#29 (0.02s) + --- 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.01s) --- 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.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#14 (0.02s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#14 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#14 (0.02s) --- 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.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#14 (0.03s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#14 (0.01s) + --- 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.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.03s) + --- 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.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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#14 (0.00s) + --- 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.01s) --- 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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#14 (0.01s) --- PASS: TestStrategicMergePatch/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.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#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/ThreeWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#14 (0.01s) + --- 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_with_server-only_items/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#14 (0.01s) + --- 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.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#14 (0.02s) --- 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.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#14 (0.01s) + --- 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_int_list_with_duplicate/TwoWay#14 (0.01s) --- 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.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#14 (0.01s) + --- 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.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#14 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#14 (0.01s) + --- 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.02s) --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#14 (0.02s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#14 (0.02s) + --- 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.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#14 (0.01s) + --- 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.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#14 (0.01s) - --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#14 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#14 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#14 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#14 (0.01s) + --- 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.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#14 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#14 (0.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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#14 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#14 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#14 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#14 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#14 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#14 (0.01s) + --- 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.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#14 (0.00s) --- 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.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#14 (0.01s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#14 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#14 (0.00s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#14 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#14 (0.01s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#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.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#15 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/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_with_conflict/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#30 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#30 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#31 (0.01s) + --- 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_duplicate_field_to_map_in_merging_list/TwoWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#15 (0.01s) + --- 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/ThreeWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#15 (0.01s) --- 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.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#15 (0.00s) + --- 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.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#15 (0.01s) --- 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.01s) + --- 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.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.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/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.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#15 (0.04s) - --- 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.03s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#15 (0.03s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#15 (0.02s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#15 (0.04s) - --- 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.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#15 (0.01s) + --- 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/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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#15 (0.02s) + --- 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.02s) - --- 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.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#30 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#31 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#31 (0.01s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#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/ThreeWay#15 (0.00s) --- 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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#15 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#15 (0.01s) + --- 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.00s) + --- 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/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.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#15 (0.01s) - --- 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.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#15 (0.00s) + --- 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/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.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#15 (0.02s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#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.00s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#15 (0.01s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#15 (0.02s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#15 (0.02s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#15 (0.02s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#15 (0.02s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#15 (0.03s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#15 (0.00s) + --- 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.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#15 (0.01s) + --- 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_3/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#15 (0.01s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#15 (0.01s) + --- 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.01s) --- 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.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#15 (0.00s) --- 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.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#15 (0.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#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.01s) + --- 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.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#15 (0.01s) + --- 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/ThreeWay#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.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#15 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#15 (0.01s) + --- 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.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.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#15 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#15 (0.01s) + --- 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.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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#15 (0.03s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#15 (0.03s) + --- 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/ThreeWay#15 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#15 (0.01s) --- 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.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#15 (0.01s) - --- 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.01s) + --- 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.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#15 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#15 (0.02s) - --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#15 (0.01s) + --- 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_adds_a_field/TwoWay#15 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#15 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#15 (0.01s) + --- 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) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#15 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#15 (0.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/nested_patch_merge_with_empty_list/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#16 (0.00s) --- 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.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#16 (0.01s) + --- 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/merge_lists_of_maps/TwoWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/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) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#16 (0.02s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#32 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#32 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#33 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#33 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#16 (0.02s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#16 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#32 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#33 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#33 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#16 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#16 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#16 (0.01s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/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/replace_map_field_value_in_merging_list/TwoWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#16 (0.01s) + --- 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.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.01s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#16 (0.00s) --- 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.01s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#16 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#16 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#16 (0.05s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#16 (0.01s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#16 (0.02s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#16 (0.02s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#16 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#16 (0.02s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#16 (0.01s) --- 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.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#16 (0.02s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_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/TwoWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#16 (0.01s) + --- 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.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#16 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#16 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#16 (0.00s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#32 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#32 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#33 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#33 (0.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#16 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#32 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#32 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#33 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#33 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#16 (0.01s) - --- 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_with_conflict/TwoWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#16 (0.02s) + --- 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.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#16 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#16 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#16 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#16 (0.00s) --- 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.01s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#16 (0.01s) + --- 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_multiple_items_in_a_list_and_preserve_order/TwoWay#16 (0.01s) - --- 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/TwoWay#16 (0.00s) + --- 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.01s) + --- 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) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#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.02s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#16 (0.02s) + --- 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_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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#16 (0.00s) @@ -15413,156 +15452,156 @@ --- 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.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.01s) + --- 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) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#16 (0.00s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#16 (0.00s) --- 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.01s) - --- 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)/TwoWay#16 (0.00s) + --- 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.01s) + --- 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) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#16 (0.00s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#16 (0.01s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#16 (0.01s) + --- 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.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.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.01s) + --- 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.01s) - --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#16 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#16 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#16 (0.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_deletes_an_item_in_nested_merging_int_list/TwoWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_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.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#16 (0.01s) - --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#16 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#16 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#16 (0.00s) --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#16 (0.01s) + --- 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) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#16 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#16 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#16 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#16 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#16 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#16 (0.01s) + --- 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_and_clear_a_field/TwoWay#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.00s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#16 (0.01s) + --- 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/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) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#17 (0.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#34 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#34 (0.01s) --- 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_with_conflict/TwoWay#17 (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.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#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.01s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#17 (0.01s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#17 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#17 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#17 (0.03s) + --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#17 (0.01s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#17 (0.01s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#17 (0.01s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#17 (0.02s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#17 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#17 (0.01s) --- 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.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#17 (0.00s) --- 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.01s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#17 (0.02s) --- 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.03s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#17 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#17 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#17 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#17 (0.02s) + --- 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.02s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#17 (0.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/ThreeWay#17 (0.01s) --- 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.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#17 (0.01s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#17 (0.01s) + --- 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/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#17 (0.00s) --- 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.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.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_map_to_merging_list_by_pointer/TwoWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#35 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#17 (0.01s) --- 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.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#17 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#17 (0.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#17 (0.00s) --- 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) @@ -15572,25 +15611,25 @@ --- 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/ThreeWay#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.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#17 (0.01s) --- 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.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/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.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.01s) + --- 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_an_item_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.00s) --- 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) @@ -15606,7 +15645,7 @@ --- 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.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_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.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#17 (0.00s) @@ -15614,73 +15653,73 @@ --- 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_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/ThreeWay#17 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#17 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#17 (0.01s) + --- 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_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) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#17 (0.01s) --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#17 (0.01s) + --- 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.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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#17 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#17 (0.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#17 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#17 (0.01s) + --- 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/ThreeWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#17 (0.00s) - --- 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.01s) - --- 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/ThreeWay#17 (0.00s) + --- 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.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#17 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#17 (0.01s) + --- 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) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#17 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#17 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#17 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#17 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#17 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#17 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#17 (0.00s) + --- 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.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#17 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#17 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#17 (0.01s) + --- 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.01s) + --- 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/ThreeWay#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.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#17 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#17 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#17 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#17 (0.01s) - --- 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/TwoWay#17 (0.01s) --- 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.00s) --- 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_and_clear_a_field/ThreeWay#17 (0.01s) - --- 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.01s) + --- 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.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#18 (0.00s) @@ -15691,10 +15730,10 @@ --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#18 (0.00s) --- 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.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#18 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#36 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#36 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#36 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#37 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#37 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#18 (0.00s) @@ -15704,11 +15743,11 @@ --- 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/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.01s) + --- 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_with_conflict/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#18 (0.01s) + --- 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/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#18 (0.00s) @@ -15724,31 +15763,31 @@ --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#18 (0.01s) + --- 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/ThreeWay#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_with_value_conflict/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#18 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#18 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#18 (0.01s) --- PASS: TestStrategicMergePatch/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.01s) - --- 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/ThreeWay#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.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#36 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#36 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#36 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#37 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#37 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#37 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#18 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#18 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#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.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.01s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#18 (0.00s) @@ -15762,43 +15801,43 @@ --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#18 (0.02s) --- 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/ThreeWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#18 (0.01s) --- 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.01s) + --- 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.01s) + --- 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.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.02s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#18 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#18 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#18 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#18 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#18 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#18 (0.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#18 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#18 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#18 (0.01s) --- 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.01s) + --- 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_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) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#18 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#18 (0.00s) @@ -15813,42 +15852,42 @@ --- 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_adds_a_field_in_a_nested_map/TwoWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#18 (0.01s) --- 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) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#18 (0.00s) --- 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/ThreeWay#18 (0.01s) --- 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_replaces_non-merging_list/TwoWay#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) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#18 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#18 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#18 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#18 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#18 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#18 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#18 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#18 (0.02s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#18 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#18 (0.00s) --- 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) @@ -15862,17 +15901,17 @@ --- 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_and_clear_a_field/ThreeWay#18 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#18 (0.01s) --- 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.01s) + --- 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) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#19 (0.01s) --- 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) @@ -15880,8 +15919,8 @@ --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#19 (0.01s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#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/merge_lists_of_maps_with_conflict/ThreeWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#38 (0.01s) --- 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) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#39 (0.00s) @@ -15890,10 +15929,10 @@ --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#19 (0.01s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#19 (0.01s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#19 (0.01s) --- 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.01s) @@ -15901,12 +15940,12 @@ --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#19 (0.01s) --- 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.01s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#19 (0.01s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#19 (0.00s) @@ -15920,52 +15959,52 @@ --- 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.01s) + --- 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.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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#19 (0.01s) + --- 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.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.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#38 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#39 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#39 (0.01s) --- 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_with_conflict/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#19 (0.01s) - --- 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.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.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#19 (0.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#19 (0.01s) --- 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) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#19 (0.01s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#19 (0.01s) --- 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/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/ThreeWay#19 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#19 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#19 (0.01s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#19 (0.00s) @@ -15978,12 +16017,12 @@ --- 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) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#19 (0.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#19 (0.01s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#19 (0.00s) @@ -15992,25 +16031,25 @@ --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#19 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#19 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/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) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#19 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#19 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#19 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#19 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#19 (0.00s) @@ -16018,15 +16057,15 @@ --- 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.02s) + --- 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_nested_merging_int_list_with_no_change/ThreeWay#19 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/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_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_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#19 (0.01s) --- 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) @@ -16042,38 +16081,38 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#19 (0.00s) --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#19 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#19 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#19 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#19 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#19 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#19 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#19 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#19 (0.02s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#19 (0.01s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#19 (0.01s) - --- PASS: TestStrategicMergePatch/Struct (0.20s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#19 (0.01s) + --- 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.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) + --- PASS: TestStrategicMergePatch/Struct/nil_patch/TwoWay (0.01s) --- PASS: TestStrategicMergePatch/Struct/nil_patch/ThreeWay (0.00s) --- 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.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.01s) + --- 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) - --- PASS: TestStrategicMergePatch/Struct/add_field_and_delete_field_from_map_with_conflict/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/Struct/add_field_and_delete_field_from_map_with_conflict/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/delete_field_from_nested_map/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/delete_field_from_nested_map/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Struct/delete_field_from_nested_map_with_conflict/TwoWay (0.01s) - --- PASS: TestStrategicMergePatch/Struct/delete_field_from_nested_map_with_conflict/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/Struct/delete_field_from_nested_map_with_conflict/TwoWay (0.00s) + --- PASS: TestStrategicMergePatch/Struct/delete_field_from_nested_map_with_conflict/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/delete_all_fields_from_map/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/delete_all_fields_from_map/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/delete_all_fields_from_map_with_conflict/TwoWay (0.00s) @@ -16082,214 +16121,214 @@ --- 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) --- PASS: TestStrategicMergePatch/Struct/add_field_and_delete_all_fields_from_map_with_conflict/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Struct/replace_list_of_scalars/TwoWay (0.01s) + --- PASS: TestStrategicMergePatch/Struct/replace_list_of_scalars/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/replace_list_of_scalars/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/replace_list_of_scalars_with_conflict/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Struct/replace_list_of_scalars_with_conflict/ThreeWay (0.01s) - --- PASS: TestStrategicMergePatch/Struct/delete_all_maps_from_merging_list/TwoWay (0.01s) + --- PASS: TestStrategicMergePatch/Struct/replace_list_of_scalars_with_conflict/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/Struct/delete_all_maps_from_merging_list/TwoWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/delete_all_maps_from_merging_list/ThreeWay (0.00s) - --- PASS: TestStrategicMergePatch/Struct/delete_all_maps_from_merging_list_with_conflict/TwoWay (0.01s) - --- 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.01s) + --- 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_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) - --- PASS: TestStrategicMergePatch/Struct/merge_empty_merging_lists/ThreeWay (0.01s) + --- PASS: TestStrategicMergePatch/Struct/merge_empty_merging_lists/ThreeWay (0.00s) --- PASS: TestStrategicMergePatch/Struct/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/TwoWay (0.00s) - --- PASS: TestStrategicMergePatch/Struct/defined_null_values_should_propagate_overwrite_current_fields_(with_conflict)/ThreeWay (0.01s) + --- 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.01s) + --- 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) - --- PASS: TestStrategicMergePatch/Struct/retainKeys_map_with_no_change_should_not_be_present/ThreeWay (0.01s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/Struct/retainKeys_map_with_no_change_should_not_be_present/ThreeWay (0.00s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#20 (0.00s) --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#20 (0.01s) + --- 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/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.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#20 (0.02s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#20 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#40 (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.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#41 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#41 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#20 (0.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_missing_map_from_merging_list/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/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.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#20 (0.01s) + --- 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/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/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.01s) --- 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.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#20 (0.01s) - --- 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.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#20 (0.04s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#40 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#40 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#41 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#41 (0.02s) + --- 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_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.01s) --- 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.02s) + --- 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.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#20 (0.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/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.01s) --- 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/ThreeWay#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.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#20 (0.01s) + --- 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.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.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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#20 (0.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#20 (0.00s) + --- 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/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.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#20 (0.01s) + --- 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) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#20 (0.01s) + --- 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.01s) --- 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_2/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/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.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.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#20 (0.01s) + --- 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_int_list_with_duplicate/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_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) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#20 (0.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#20 (0.01s) + --- 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) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#20 (0.00s) + --- 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.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#20 (0.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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#20 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#20 (0.00s) --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#20 (0.01s) + --- 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_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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#20 (0.01s) + --- 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_deletes_nested_merging_list/TwoWay#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_an_item_in_nested_merging_list/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#20 (0.00s) + --- 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.01s) --- 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.01s) - --- 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.01s) + --- 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.01s) + --- 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.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#20 (0.01s) --- 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.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#20 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#20 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#20 (0.03s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#20 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#20 (0.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#20 (0.01s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#20 (0.02s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#20 (0.03s) + --- 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.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#20 (0.00s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#20 (0.01s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#21 (0.00s) @@ -16307,25 +16346,25 @@ --- 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.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#21 (0.01s) + --- 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/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/replace_map_field_value_in_merging_list/TwoWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#21 (0.01s) --- 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) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#21 (0.01s) --- 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_missing_map_from_merging_list/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/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.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#21 (0.00s) --- 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.00s) @@ -16335,472 +16374,472 @@ --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#21 (0.01s) --- PASS: TestStrategicMergePatch/delete_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.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.02s) + --- 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.03s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#21 (0.01s) + --- 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.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/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.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.03s) + --- 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.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#43 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#43 (0.03s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#43 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#21 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#21 (0.03s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#21 (0.03s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#21 (0.03s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#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.01s) + --- 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.00s) + --- 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/merge_lists_of_scalars/TwoWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#21 (0.01s) + --- 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.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.01s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#21 (0.02s) + --- 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/ThreeWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#21 (0.02s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#21 (0.02s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#21 (0.02s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#21 (0.01s) - --- 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.01s) - --- 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/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#21 (0.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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#21 (0.01s) + --- 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.01s) + --- 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/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/ThreeWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#21 (0.01s) --- 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/ThreeWay#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_with_server-only_items/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#21 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#21 (0.01s) + --- 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/ThreeWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#21 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#21 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#21 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#21 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#21 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#21 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#21 (0.01s) + --- 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.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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#21 (0.01s) - --- 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/TwoWay#21 (0.00s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#21 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#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_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.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#21 (0.01s) + --- 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) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#21 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#21 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#21 (0.03s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#21 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#21 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#21 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#21 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#21 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#21 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#21 (0.01s) + --- 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/ThreeWay#21 (0.02s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#21 (0.01s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#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.01s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#22 (0.01s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#22 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#22 (0.02s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#22 (0.00s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#22 (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.01s) - --- 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/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/ThreeWay#45 (0.01s) --- 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.03s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/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.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.01s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#22 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#22 (0.01s) + --- 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.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.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#22 (0.02s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#22 (0.01s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#22 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#22 (0.03s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#22 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#22 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#22 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#22 (0.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.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#22 (0.02s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#22 (0.03s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#22 (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#22 (0.00s) --- 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.03s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#22 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#22 (0.03s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#22 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#22 (0.02s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#22 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#22 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#22 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#22 (0.02s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#22 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#22 (0.03s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#22 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#22 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#22 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#22 (0.03s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#44 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#44 (0.03s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#45 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#45 (0.03s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#22 (0.02s) + --- PASS: TestStrategicMergePatch/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.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#44 (0.02s) + --- 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_map_to_merging_list_by_pointer/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#22 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#22 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#22 (0.01s) - --- 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.00s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#22 (0.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#22 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/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.01s) --- 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/ThreeWay#22 (0.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#22 (0.01s) + --- 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/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#22 (0.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#22 (0.01s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#22 (0.02s) + --- 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/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.03s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#22 (0.01s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#22 (0.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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#22 (0.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#22 (0.01s) + --- 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.01s) + --- 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.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_multiple_items_in_a_int_list_and_preserve_order/TwoWay#22 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#22 (0.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#22 (0.02s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#22 (0.02s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#22 (0.01s) + --- 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/ThreeWay#22 (0.01s) --- 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.01s) + --- 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.01s) + --- 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/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#22 (0.02s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#22 (0.01s) --- 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.02s) + --- 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.01s) + --- 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_with_conflict_(discriminated_union)/TwoWay#22 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#22 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#22 (0.00s) --- 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.01s) + --- 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) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#22 (0.01s) --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#22 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#22 (0.01s) - --- 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/ThreeWay#22 (0.01s) + --- 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.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.01s) - --- 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.01s) + --- 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.01s) + --- 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/ThreeWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#22 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/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.01s) --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#22 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#22 (0.01s) - --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#22 (0.01s) + --- 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/ThreeWay#22 (0.02s) - --- 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.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#22 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#22 (0.03s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#22 (0.03s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#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.01s) + --- 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_deletes_an_item_in_nested_merging_int_list/TwoWay#22 (0.01s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#22 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#22 (0.01s) - --- 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.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#22 (0.01s) + --- 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.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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#22 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#22 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#22 (0.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#22 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#22 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#22 (0.01s) + --- 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_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.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/TwoWay#22 (0.00s) --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#22 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#22 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#22 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#22 (0.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) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#22 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#22 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#22 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#22 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#22 (0.01s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#22 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#23 (0.01s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#23 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#46 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#46 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#47 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#23 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#23 (0.02s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#23 (0.01s) - --- 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.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.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#23 (0.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.02s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#23 (0.02s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#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.01s) --- 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.01s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#23 (0.02s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#23 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#23 (0.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#23 (0.03s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#23 (0.01s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#23 (0.02s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#23 (0.02s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#23 (0.02s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_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/TwoWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#23 (0.03s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#46 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#46 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#47 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#47 (0.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#46 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#46 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#47 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#47 (0.01s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#23 (0.04s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#23 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#23 (0.03s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#23 (0.01s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/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/delete_an_item_in_a_list_and_preserve_order/ThreeWay#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.01s) + --- 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.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#23 (0.01s) - --- 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/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.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#23 (0.00s) + --- 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/add_an_item_in_a_int_list_and_preserve_order/TwoWay#23 (0.01s) --- 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) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#23 (0.02s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#23 (0.01s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#23 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#23 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#23 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#23 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#23 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#23 (0.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) @@ -16815,36 +16854,36 @@ --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#23 (0.01s) + --- 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/TwoWay#23 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#23 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#23 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#23 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#23 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#23 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#23 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#23 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#23 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#23 (0.00s) @@ -16853,14 +16892,14 @@ --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#23 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#23 (0.01s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#23 (0.00s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#23 (0.01s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#23 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#24 (0.01s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#24 (0.00s) @@ -16868,118 +16907,118 @@ --- 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/TwoWay#49 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#49 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#24 (0.00s) --- 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_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#24 (0.01s) --- 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.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#24 (0.00s) --- 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.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#24 (0.01s) --- 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.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#24 (0.01s) + --- 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.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.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.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#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) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#24 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#48 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#48 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#48 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#49 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#49 (0.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#49 (0.01s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#24 (0.01s) --- 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.02s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#24 (0.01s) + --- 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.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.01s) + --- 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) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#24 (0.03s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#24 (0.02s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#24 (0.01s) - --- 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.02s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#24 (0.01s) + --- 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.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#24 (0.01s) + --- 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_2/TwoWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#24 (0.01s) + --- 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) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#24 (0.02s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#24 (0.02s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#24 (0.01s) + --- 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/ThreeWay#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.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#24 (0.02s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#24 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#24 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#24 (0.01s) + --- 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.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#24 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#24 (0.00s) @@ -16990,246 +17029,246 @@ --- 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/ThreeWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#24 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#24 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#24 (0.01s) + --- 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_adds_an_item_in_nested_merging_int_list/TwoWay#24 (0.01s) --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#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.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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#24 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#24 (0.01s) + --- 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/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.01s) --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#24 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#24 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#24 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#24 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#24 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#24 (0.01s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#24 (0.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#25 (0.01s) - --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#24 (0.00s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#25 (0.01s) --- 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/ThreeWay#25 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#25 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#25 (0.02s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#25 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#50 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#50 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#51 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#51 (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.01s) + --- 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/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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#25 (0.02s) + --- 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.01s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#25 (0.02s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#25 (0.01s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#25 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#25 (0.01s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#25 (0.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#25 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#25 (0.02s) + --- 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/add_map_and_delete_map_from_merging_list/TwoWay#25 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#25 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#25 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#25 (0.02s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_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/delete_field_from_map_in_merging_list/TwoWay#25 (0.01s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#25 (0.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.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#25 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#25 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#25 (0.01s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#25 (0.02s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#25 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#25 (0.02s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#25 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#25 (0.04s) - --- 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.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#25 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#25 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#25 (0.03s) + --- 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_deletion_conflict/TwoWay#50 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#50 (0.03s) - --- 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.03s) - --- 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.02s) + --- 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.01s) + --- 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/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.02s) - --- 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.02s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#25 (0.01s) + --- 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/ThreeWay#25 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#25 (0.03s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#25 (0.02s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#25 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#25 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#25 (0.01s) + --- 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.01s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#25 (0.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#25 (0.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#25 (0.01s) - --- 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/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/ThreeWay#25 (0.02s) --- 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.01s) + --- 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.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.01s) - --- 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/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_3/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#25 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#25 (0.01s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#25 (0.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#25 (0.02s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#25 (0.00s) --- 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.01s) + --- 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/set_elements_order_in_a_int_list/TwoWay#25 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#25 (0.03s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#25 (0.02s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#25 (0.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#25 (0.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#25 (0.02s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#25 (0.02s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#25 (0.01s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_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.02s) + --- 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_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_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#25 (0.01s) --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#25 (0.02s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#25 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#25 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#25 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#25 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#25 (0.01s) - --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#25 (0.00s) + --- 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.02s) + --- 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/ThreeWay#25 (0.02s) - --- 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.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.01s) + --- 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.02s) - --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#25 (0.01s) + --- 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.03s) + --- 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/ThreeWay#25 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#25 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#25 (0.03s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#25 (0.02s) + --- 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/ThreeWay#25 (0.01s) + --- 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_nested_merging_list_with_no_change/TwoWay#25 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#25 (0.02s) - --- 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.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.01s) + --- 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/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.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#25 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#25 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#25 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#25 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#25 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#25 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#25 (0.00s) + --- 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.03s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#25 (0.00s) --- 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.02s) - --- 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.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#25 (0.01s) + --- 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.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.01s) - --- 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.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#25 (0.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#25 (0.00s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#25 (0.02s) + --- 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) @@ -17237,207 +17276,207 @@ --- 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.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#26 (0.02s) + --- 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.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.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#52 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#53 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#53 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#53 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#26 (0.05s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#26 (0.02s) - --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#26 (0.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.02s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#26 (0.02s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#26 (0.01s) + --- 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.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_map_from_merging_list_with_conflict/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#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.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/ThreeWay#26 (0.02s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#26 (0.02s) + --- 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.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.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#26 (0.00s) + --- 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.01s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#26 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#52 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#52 (0.04s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#53 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#53 (0.03s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#52 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#52 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#53 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#53 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#26 (0.02s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#26 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#26 (0.03s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#26 (0.00s) --- 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.01s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#26 (0.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#26 (0.02s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#26 (0.00s) + --- 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.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#26 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/TwoWay#26 (0.02s) --- 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.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.01s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#26 (0.00s) --- 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.01s) + --- 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.01s) + --- 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_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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/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.02s) --- 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/ThreeWay#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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#26 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_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.01s) + --- 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/ThreeWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#26 (0.01s) + --- 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_and_clears_a_field/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/TwoWay#26 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#26 (0.01s) + --- 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_adds_a_field_in_a_nested_map/TwoWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#26 (0.01s) + --- 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.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#26 (0.01s) --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#26 (0.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#26 (0.01s) + --- 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.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#26 (0.01s) - --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#26 (0.01s) + --- 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/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.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#26 (0.00s) --- 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.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#26 (0.02s) + --- 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.01s) --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#26 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#26 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#26 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#26 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#26 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#26 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#26 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#26 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#26 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#26 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#26 (0.01s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#26 (0.00s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#27 (0.01s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#54 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#54 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#55 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#55 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#27 (0.02s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#54 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#55 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#55 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#27 (0.01s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#27 (0.00s) @@ -17445,753 +17484,753 @@ --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#27 (0.02s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#27 (0.02s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#27 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#27 (0.03s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#27 (0.02s) + --- 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.02s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#27 (0.01s) --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#27 (0.01s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#27 (0.02s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#27 (0.01s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#27 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#27 (0.02s) - --- 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.03s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#54 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#54 (0.03s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#55 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#55 (0.03s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#27 (0.01s) + --- 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.01s) + --- 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.02s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#55 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#55 (0.01s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#27 (0.02s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer_with_conflict/ThreeWay#27 (0.01s) --- 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.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/TwoWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#27 (0.04s) + --- 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_with_conflict/TwoWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer_with_conflict/ThreeWay#27 (0.01s) --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#27 (0.01s) + --- 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_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#27 (0.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_list_and_preserve_order/ThreeWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#27 (0.01s) --- PASS: TestStrategicMergePatch/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.01s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#27 (0.01s) - --- 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.01s) + --- 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/set_elements_order_in_a_list/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#27 (0.02s) + --- 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_2/TwoWay#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.03s) - --- 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/TwoWay#27 (0.00s) + --- 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.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#27 (0.02s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#27 (0.00s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#27 (0.00s) + --- 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.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/ThreeWay#27 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field/ThreeWay#27 (0.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#27 (0.01s) + --- 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) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#27 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#27 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#27 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#27 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#27 (0.03s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#27 (0.03s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#27 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#27 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#27 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#27 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#27 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#27 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#27 (0.01s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#27 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#27 (0.02s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#27 (0.00s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#27 (0.00s) --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#28 (0.02s) + --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#28 (0.03s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#56 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#56 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#56 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#57 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#57 (0.01s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#28 (0.02s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#28 (0.02s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#28 (0.01s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#28 (0.01s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#28 (0.02s) --- 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/replace_non_merging_list_nested_in_merging_list/TwoWay#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.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#28 (0.02s) + --- 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.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/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#28 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#56 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#56 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#57 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#57 (0.03s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#28 (0.02s) + --- 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.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/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_map_to_merging_list_by_pointer/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_to_merging_list_by_pointer/ThreeWay#28 (0.01s) + --- 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_field_to_map_in_merging_list_by_pointer/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#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.04s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/TwoWay#28 (0.01s) + --- 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.02s) + --- 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/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.01s) + --- 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/ThreeWay#28 (0.02s) + --- 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.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_list_and_preserve_order/ThreeWay#28 (0.01s) - --- 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.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_and_preserve_order/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#28 (0.02s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#28 (0.02s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#28 (0.03s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#28 (0.02s) + --- 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/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.01s) --- 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.01s) + --- 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/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.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#28 (0.01s) + --- 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.02s) + --- 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_2/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/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.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#28 (0.02s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#28 (0.02s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#28 (0.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.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#28 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#28 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_and_clear_a_field/TwoWay#28 (0.01s) + --- 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.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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_and_clears_a_field/ThreeWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#28 (0.03s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change/ThreeWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_non-merging_list_with_no_change_with_conflict/ThreeWay#28 (0.02s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#28 (0.01s) + --- 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_deletes_nested_non-merging_list/TwoWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_non-merging_list/ThreeWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/ThreeWay#28 (0.02s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/TwoWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_int_list_with_no_change/ThreeWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#28 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#28 (0.01s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#28 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#28 (0.01s) + --- 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.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.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#28 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#28 (0.02s) + --- 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.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#28 (0.04s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#28 (0.03s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#28 (0.03s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#28 (0.02s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#28 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#28 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#28 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#28 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#28 (0.02s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#28 (0.02s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#28 (0.01s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/nested_patch_merge_with_empty_list/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#28 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#28 (0.00s) + --- 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.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) --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/delete_items_in_lists_of_scalars/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/TwoWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/delete_all_duplicate_items_in_lists_of_scalars/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/TwoWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_items_in_lists_of_scalars/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/merge_lists_of_maps/ThreeWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#29 (0.02s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/TwoWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/merge_lists_of_maps_with_conflict/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#58 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#58 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#58 (0.00s) --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/TwoWay#59 (0.00s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#59 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#29 (0.02s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list/ThreeWay#59 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/TwoWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_with_conflict/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_an_item_that_already_exists_in_current_object_in_merging_list/ThreeWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_list_with_conflict/ThreeWay#29 (0.01s) --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#29 (0.02s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/TwoWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/replace_map_field_value_in_merging_list_with_conflict/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/TwoWay#29 (0.01s) --- PASS: TestStrategicMergePatch/delete_map_from_merging_list/ThreeWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#29 (0.02s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/TwoWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/delete_map_from_merging_list_with_conflict/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list/ThreeWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#29 (0.02s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#29 (0.02s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/TwoWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/delete_missing_map_from_merging_list_with_conflict/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/TwoWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list/ThreeWay#29 (0.01s) --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#29 (0.02s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#29 (0.02s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/ThreeWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list_with_conflict/ThreeWay#29 (0.02s) + --- PASS: TestStrategicMergePatch/add_map_and_delete_map_from_merging_list_with_conflict/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/delete_field_from_map_in_merging_list/TwoWay#29 (0.01s) + --- 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.00s) --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list/ThreeWay#29 (0.02s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/TwoWay#29 (0.02s) - --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#29 (0.03s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#29 (0.01s) + --- 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) + --- PASS: TestStrategicMergePatch/delete_missing_field_from_map_in_merging_list_with_conflict/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/TwoWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#29 (0.03s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#29 (0.03s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list/ThreeWay#29 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#29 (0.03s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#58 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_value_conflict/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/replace_non_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#29 (0.00s) + --- 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.02s) + --- 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.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/TwoWay#59 (0.01s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_nested_in_merging_list_with_deletion_conflict/ThreeWay#59 (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.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.01s) - --- 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.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/TwoWay#29 (0.02s) - --- PASS: TestStrategicMergePatch/add_field_to_map_in_merging_list_by_pointer/ThreeWay#29 (0.02s) - --- 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.02s) + --- 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.01s) + --- 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.01s) + --- 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/merge_lists_of_scalars/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#29 (0.02s) + --- PASS: TestStrategicMergePatch/merge_lists_of_scalars/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_duplicate_field_to_map_in_merging_int_list/TwoWay#29 (0.00s) --- 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.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_list_of_primitives_and_preserve_order/TwoWay#29 (0.01s) + --- 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_multiple_items_in_a_list_and_preserve_order/TwoWay#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.01s) --- 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/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.02s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_list_and_preserve_order/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/change_an_item_in_a_list_and_preserve_order/ThreeWay#29 (0.01s) + --- 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/set_elements_order_in_a_list/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#29 (0.02s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items/ThreeWay#29 (0.02s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/TwoWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list/ThreeWay#29 (0.01s) + --- 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_2/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_2/ThreeWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_list_with_server-only_items_3/TwoWay#29 (0.01s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#29 (0.01s) + --- 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/add_an_item_in_a_int_list_and_preserve_order/TwoWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/add_an_item_in_a_int_list_and_preserve_order/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/add_multiple_items_in_a_int_list_and_preserve_order/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/TwoWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/TwoWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/add_and_delete_an_item_in_a_int_list_and_preserve_order/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/TwoWay#29 (0.01s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_2/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/set_elements_order_in_a_int_list_with_server-only_items_3/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_list_with_duplicate/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/behavior_of_set_element_order_for_a_merging_int_list_with_duplicate/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field/ThreeWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/ThreeWay#29 (0.05s) + --- PASS: TestStrategicMergePatch/retainKeys_map_should_clear_defaulted_field_with_conflict_(discriminated_union)/TwoWay#29 (0.01s) + --- 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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field/ThreeWay#29 (0.00s) --- 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.01s) + --- 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/ThreeWay#29 (0.01s) --- 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_clears_a_field/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_clears_a_field/ThreeWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_map_with_no_change/TwoWay#29 (0.01s) - --- 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.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_adds_a_field_in_a_nested_map/TwoWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_a_field_in_a_nested_map/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_a_field_in_a_nested_map/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map/ThreeWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/TwoWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_changes_a_field_in_a_nested_map_with_conflict/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/TwoWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_replaces_non-merging_list/ThreeWay#29 (0.01s) --- 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.01s) + --- 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.03s) - --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_with_conflict/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_delete_nested_non-merging_list_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.01s) + --- 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.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_nested_merging_int_list_with_no_change/ThreeWay#29 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_int_list/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_int_list/ThreeWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_and_deletes_an_item_in_nested_merging_int_list/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_int_list/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_nested_merging_list_with_no_change/TwoWay#29 (0.00s) + --- 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.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_adds_an_item_in_nested_merging_list/ThreeWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_map_changes_an_item_in_nested_merging_list/ThreeWay#29 (0.02s) - --- 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_an_item_in_nested_merging_list/TwoWay#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.01s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_nested_merging_list/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_map_deletes_an_item_in_nested_merging_list/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#29 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#29 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#29 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#29 (0.02s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#29 (0.01s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/TwoWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_clears_a_field_with_conflict/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/TwoWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/TwoWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_changes_a_field_and_clear_a_field_with_conflict/ThreeWay#29 (0.00s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/TwoWay#29 (0.01s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_adds_a_field_and_clear_a_field/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/TwoWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#29 (0.01s) + --- PASS: TestStrategicMergePatch/retainKeys_list_of_maps_deletes_a_field_and_clear_a_field/ThreeWay#29 (0.00s) --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/TwoWay#29 (0.00s) - --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#29 (0.02s) + --- PASS: TestStrategicMergePatch/delete_and_reorder_in_one_list,_reorder_in_another/ThreeWay#29 (0.00s) === RUN TestNumberConversion --- PASS: TestNumberConversion (0.01s) === RUN TestReplaceWithRawExtension ---- PASS: TestReplaceWithRawExtension (0.10s) +--- PASS: TestReplaceWithRawExtension (0.05s) === 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_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_value_other_mergeItemPtr_simpleMap_replacingItem])/TwoWay -=== RUN TestUnknownField/add_empty_slices/Kind([other_mergeItemPtr_simpleMap_replacingItem_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name])/ThreeWay +=== RUN TestUnknownField/add_empty_slices/Kind([other_mergingList_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_value_nonMergingIntList_simpleMap_retainKeysMap])/TwoWay +=== RUN TestUnknownField/add_empty_slices/Kind([mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other_mergingList_nonMergingList_simpleMap_retainKeysMap_name_value_nonMergingIntList])/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([retainKeysMergingList_name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_value_other_mergeItemPtr_simpleMap_replacingItem])/TwoWay -=== RUN TestUnknownField/add_only_not_nulls/Kind([replacingItem_value_other_mergeItemPtr_simpleMap_nonMergingIntList_retainKeysMap_retainKeysMergingList_name_mergingList_nonMergingList_mergingIntList])/ThreeWay +=== RUN TestUnknownField/add_only_not_nulls/Kind([name_value_nonMergingIntList_simpleMap_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList])/TwoWay +=== RUN TestUnknownField/add_only_not_nulls/Kind([nonMergingIntList_simpleMap_retainKeysMap_name_value_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other_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([retainKeysMap_retainKeysMergingList_name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_value_other_mergeItemPtr_simpleMap_replacingItem])/TwoWay -=== RUN TestUnknownField/added_only/Kind([name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_value_other_mergeItemPtr_simpleMap_replacingItem])/ThreeWay +=== RUN TestUnknownField/added_only/Kind([simpleMap_retainKeysMap_name_value_nonMergingIntList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other_mergingList_nonMergingList])/TwoWay +=== RUN TestUnknownField/added_only/Kind([name_value_nonMergingIntList_simpleMap_retainKeysMap_retainKeysMergingList_other_mergingList_nonMergingList_mergingIntList_mergeItemPtr_replacingItem])/ThreeWay === RUN TestUnknownField/added_only/Struct/TwoWay === RUN TestUnknownField/added_only/Struct/ThreeWay === RUN TestUnknownField/diff === RUN TestUnknownField/diff/struct/TwoWay === RUN TestUnknownField/diff/struct/ThreeWay -=== RUN TestUnknownField/diff/Kind([name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_value_other_mergeItemPtr_simpleMap_replacingItem])/TwoWay -=== RUN TestUnknownField/diff/Kind([mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name_other_mergeItemPtr_simpleMap_replacingItem_value])/ThreeWay +=== RUN TestUnknownField/diff/Kind([simpleMap_retainKeysMap_name_value_nonMergingIntList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other_mergingList_nonMergingList])/TwoWay +=== RUN TestUnknownField/diff/Kind([other_mergingList_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_value_nonMergingIntList_simpleMap_retainKeysMap])/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([value_other_mergeItemPtr_simpleMap_replacingItem_name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList])/TwoWay -=== RUN TestUnknownField/discard_if_modified_all_nulls/Kind([mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name_mergingList_nonMergingList_simpleMap_replacingItem_value_other_mergeItemPtr])/ThreeWay +=== RUN TestUnknownField/discard_if_modified_all_nulls/Kind([other_mergingList_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_value_nonMergingIntList_simpleMap_retainKeysMap])/TwoWay +=== RUN TestUnknownField/discard_if_modified_all_nulls/Kind([other_mergingList_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_value_nonMergingIntList_simpleMap_retainKeysMap])/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([other_mergeItemPtr_simpleMap_replacingItem_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name])/TwoWay -=== RUN TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/Kind([simpleMap_replacingItem_value_other_mergeItemPtr_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name_mergingList_nonMergingList])/ThreeWay +=== RUN TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/Kind([mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other_mergingList_nonMergingList_simpleMap_retainKeysMap_name_value_nonMergingIntList])/TwoWay +=== RUN TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/Kind([nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other_mergingList_nonMergingIntList_simpleMap_retainKeysMap_name_value])/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([name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_value_other_mergeItemPtr_simpleMap_replacingItem])/TwoWay -=== RUN TestUnknownField/filter_if_slice_is_all_empty/Kind([simpleMap_replacingItem_value_other_mergeItemPtr_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name_mergingList_nonMergingList])/ThreeWay +=== RUN TestUnknownField/filter_if_slice_is_all_empty/Kind([retainKeysMergingList_other_mergingList_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_name_value_nonMergingIntList_simpleMap_retainKeysMap])/TwoWay +=== RUN TestUnknownField/filter_if_slice_is_all_empty/Kind([nonMergingIntList_simpleMap_retainKeysMap_name_value_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other_mergingList])/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([value_other_mergeItemPtr_simpleMap_replacingItem_retainKeysMergingList_name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap])/TwoWay -=== RUN TestUnknownField/filter_nulls_from_nested_slices/Kind([name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_value_other_mergeItemPtr_simpleMap_replacingItem])/ThreeWay +=== RUN TestUnknownField/filter_nulls_from_nested_slices/Kind([name_value_nonMergingIntList_simpleMap_retainKeysMap_replacingItem_retainKeysMergingList_other_mergingList_nonMergingList_mergingIntList_mergeItemPtr])/TwoWay +=== RUN TestUnknownField/filter_nulls_from_nested_slices/Kind([value_nonMergingIntList_simpleMap_retainKeysMap_name_mergingList_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other])/ThreeWay === RUN TestUnknownField/filter_nulls_from_nested_slices/Struct/TwoWay === RUN TestUnknownField/filter_nulls_from_nested_slices/Struct/ThreeWay === RUN TestUnknownField/nested_null_values_in_original_are_preserved === RUN TestUnknownField/nested_null_values_in_original_are_preserved/struct/TwoWay === RUN TestUnknownField/nested_null_values_in_original_are_preserved/struct/ThreeWay -=== RUN TestUnknownField/nested_null_values_in_original_are_preserved/Kind([mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name_other_mergeItemPtr_simpleMap_replacingItem_value])/TwoWay -=== RUN TestUnknownField/nested_null_values_in_original_are_preserved/Kind([value_other_mergeItemPtr_simpleMap_replacingItem_name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList])/ThreeWay +=== RUN TestUnknownField/nested_null_values_in_original_are_preserved/Kind([mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other_mergingList_nonMergingList_simpleMap_retainKeysMap_name_value_nonMergingIntList])/TwoWay +=== RUN TestUnknownField/nested_null_values_in_original_are_preserved/Kind([retainKeysMap_name_value_nonMergingIntList_simpleMap_mergeItemPtr_replacingItem_retainKeysMergingList_other_mergingList_nonMergingList_mergingIntList])/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([nonMergingIntList_retainKeysMap_retainKeysMergingList_name_mergingList_nonMergingList_mergingIntList_replacingItem_value_other_mergeItemPtr_simpleMap])/TwoWay -=== RUN TestUnknownField/no_diff/Kind([mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name_mergingList_nonMergingList_simpleMap_replacingItem_value_other_mergeItemPtr])/ThreeWay +=== RUN TestUnknownField/no_diff/Kind([retainKeysMergingList_other_mergingList_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_name_value_nonMergingIntList_simpleMap_retainKeysMap])/TwoWay +=== RUN TestUnknownField/no_diff/Kind([nonMergingIntList_simpleMap_retainKeysMap_name_value_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other_mergingList])/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([mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name_mergingList_nonMergingList_simpleMap_replacingItem_value_other_mergeItemPtr])/TwoWay -=== RUN TestUnknownField/no_diff_even_if_modified_null/Kind([value_other_mergeItemPtr_simpleMap_replacingItem_name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList])/ThreeWay +=== RUN TestUnknownField/no_diff_even_if_modified_null/Kind([other_mergingList_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_value_nonMergingIntList_simpleMap_retainKeysMap])/TwoWay +=== RUN TestUnknownField/no_diff_even_if_modified_null/Kind([other_mergingList_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_value_nonMergingIntList_simpleMap_retainKeysMap])/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([retainKeysMergingList_name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_value_other_mergeItemPtr_simpleMap_replacingItem])/TwoWay -=== RUN TestUnknownField/not_filter_nulls_from_non-associative_slice/Kind([name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_value_other_mergeItemPtr_simpleMap_replacingItem])/ThreeWay +=== RUN TestUnknownField/not_filter_nulls_from_non-associative_slice/Kind([mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other_mergingList_nonMergingList_simpleMap_retainKeysMap_name_value_nonMergingIntList])/TwoWay +=== RUN TestUnknownField/not_filter_nulls_from_non-associative_slice/Kind([mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other_mergingList_nonMergingList_simpleMap_retainKeysMap_name_value_nonMergingIntList])/ThreeWay === RUN TestUnknownField/not_filter_nulls_from_non-associative_slice/Struct/TwoWay === RUN TestUnknownField/not_filter_nulls_from_non-associative_slice/Struct/ThreeWay === RUN TestUnknownField/null_values_in_original_are_preserved === RUN TestUnknownField/null_values_in_original_are_preserved/struct/TwoWay === RUN TestUnknownField/null_values_in_original_are_preserved/struct/ThreeWay -=== RUN TestUnknownField/null_values_in_original_are_preserved/Kind([name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_value_other_mergeItemPtr_simpleMap_replacingItem])/TwoWay -=== RUN TestUnknownField/null_values_in_original_are_preserved/Kind([other_mergeItemPtr_simpleMap_replacingItem_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name])/ThreeWay +=== RUN TestUnknownField/null_values_in_original_are_preserved/Kind([retainKeysMergingList_other_mergingList_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_name_value_nonMergingIntList_simpleMap_retainKeysMap])/TwoWay +=== RUN TestUnknownField/null_values_in_original_are_preserved/Kind([name_value_nonMergingIntList_simpleMap_retainKeysMap_replacingItem_retainKeysMergingList_other_mergingList_nonMergingList_mergingIntList_mergeItemPtr])/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([nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name_mergingList_mergeItemPtr_simpleMap_replacingItem_value_other])/TwoWay -=== RUN TestUnknownField/removed_only/Kind([value_other_mergeItemPtr_simpleMap_replacingItem_name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList])/ThreeWay +=== RUN TestUnknownField/removed_only/Kind([nonMergingIntList_simpleMap_retainKeysMap_name_value_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other_mergingList])/TwoWay +=== RUN TestUnknownField/removed_only/Kind([name_value_nonMergingIntList_simpleMap_retainKeysMap_retainKeysMergingList_other_mergingList_nonMergingList_mergingIntList_mergeItemPtr_replacingItem])/ThreeWay === RUN TestUnknownField/removed_only/Struct/TwoWay === RUN TestUnknownField/removed_only/Struct/ThreeWay ---- PASS: TestUnknownField (0.25s) - --- PASS: TestUnknownField/add_empty_slices (0.02s) +--- PASS: TestUnknownField (0.05s) + --- PASS: TestUnknownField/add_empty_slices (0.00s) --- PASS: TestUnknownField/add_empty_slices/struct/TwoWay (0.00s) - --- PASS: TestUnknownField/add_empty_slices/struct/ThreeWay (0.01s) - --- PASS: TestUnknownField/add_empty_slices/Kind([name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_value_other_mergeItemPtr_simpleMap_replacingItem])/TwoWay (0.00s) - --- PASS: TestUnknownField/add_empty_slices/Kind([other_mergeItemPtr_simpleMap_replacingItem_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name])/ThreeWay (0.00s) - --- PASS: TestUnknownField/add_empty_slices/Struct/TwoWay (0.01s) + --- PASS: TestUnknownField/add_empty_slices/struct/ThreeWay (0.00s) + --- PASS: TestUnknownField/add_empty_slices/Kind([other_mergingList_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_value_nonMergingIntList_simpleMap_retainKeysMap])/TwoWay (0.00s) + --- PASS: TestUnknownField/add_empty_slices/Kind([mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other_mergingList_nonMergingList_simpleMap_retainKeysMap_name_value_nonMergingIntList])/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.01s) + --- PASS: TestUnknownField/add_only_not_nulls (0.00s) --- PASS: TestUnknownField/add_only_not_nulls/struct/TwoWay (0.00s) --- PASS: TestUnknownField/add_only_not_nulls/struct/ThreeWay (0.00s) - --- PASS: TestUnknownField/add_only_not_nulls/Kind([retainKeysMergingList_name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_value_other_mergeItemPtr_simpleMap_replacingItem])/TwoWay (0.00s) - --- PASS: TestUnknownField/add_only_not_nulls/Kind([replacingItem_value_other_mergeItemPtr_simpleMap_nonMergingIntList_retainKeysMap_retainKeysMergingList_name_mergingList_nonMergingList_mergingIntList])/ThreeWay (0.00s) + --- PASS: TestUnknownField/add_only_not_nulls/Kind([name_value_nonMergingIntList_simpleMap_retainKeysMap_other_mergingList_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList])/TwoWay (0.00s) + --- PASS: TestUnknownField/add_only_not_nulls/Kind([nonMergingIntList_simpleMap_retainKeysMap_name_value_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other_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.01s) --- PASS: TestUnknownField/added_only/struct/TwoWay (0.00s) --- PASS: TestUnknownField/added_only/struct/ThreeWay (0.00s) - --- PASS: TestUnknownField/added_only/Kind([retainKeysMap_retainKeysMergingList_name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_value_other_mergeItemPtr_simpleMap_replacingItem])/TwoWay (0.00s) - --- PASS: TestUnknownField/added_only/Kind([name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_value_other_mergeItemPtr_simpleMap_replacingItem])/ThreeWay (0.00s) + --- PASS: TestUnknownField/added_only/Kind([simpleMap_retainKeysMap_name_value_nonMergingIntList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other_mergingList_nonMergingList])/TwoWay (0.00s) + --- PASS: TestUnknownField/added_only/Kind([name_value_nonMergingIntList_simpleMap_retainKeysMap_retainKeysMergingList_other_mergingList_nonMergingList_mergingIntList_mergeItemPtr_replacingItem])/ThreeWay (0.00s) --- PASS: TestUnknownField/added_only/Struct/TwoWay (0.00s) --- PASS: TestUnknownField/added_only/Struct/ThreeWay (0.00s) - --- PASS: TestUnknownField/diff (0.03s) + --- PASS: TestUnknownField/diff (0.00s) --- PASS: TestUnknownField/diff/struct/TwoWay (0.00s) - --- PASS: TestUnknownField/diff/struct/ThreeWay (0.01s) - --- PASS: TestUnknownField/diff/Kind([name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_value_other_mergeItemPtr_simpleMap_replacingItem])/TwoWay (0.00s) - --- PASS: TestUnknownField/diff/Kind([mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name_other_mergeItemPtr_simpleMap_replacingItem_value])/ThreeWay (0.00s) + --- PASS: TestUnknownField/diff/struct/ThreeWay (0.00s) + --- PASS: TestUnknownField/diff/Kind([simpleMap_retainKeysMap_name_value_nonMergingIntList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other_mergingList_nonMergingList])/TwoWay (0.00s) + --- PASS: TestUnknownField/diff/Kind([other_mergingList_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_value_nonMergingIntList_simpleMap_retainKeysMap])/ThreeWay (0.00s) --- PASS: TestUnknownField/diff/Struct/TwoWay (0.00s) - --- PASS: TestUnknownField/diff/Struct/ThreeWay (0.01s) - --- PASS: TestUnknownField/discard_if_modified_all_nulls (0.01s) + --- PASS: TestUnknownField/diff/Struct/ThreeWay (0.00s) + --- PASS: TestUnknownField/discard_if_modified_all_nulls (0.00s) --- PASS: TestUnknownField/discard_if_modified_all_nulls/struct/TwoWay (0.00s) --- PASS: TestUnknownField/discard_if_modified_all_nulls/struct/ThreeWay (0.00s) - --- PASS: TestUnknownField/discard_if_modified_all_nulls/Kind([value_other_mergeItemPtr_simpleMap_replacingItem_name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList])/TwoWay (0.00s) - --- PASS: TestUnknownField/discard_if_modified_all_nulls/Kind([mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name_mergingList_nonMergingList_simpleMap_replacingItem_value_other_mergeItemPtr])/ThreeWay (0.00s) + --- PASS: TestUnknownField/discard_if_modified_all_nulls/Kind([other_mergingList_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_value_nonMergingIntList_simpleMap_retainKeysMap])/TwoWay (0.00s) + --- PASS: TestUnknownField/discard_if_modified_all_nulls/Kind([other_mergingList_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_value_nonMergingIntList_simpleMap_retainKeysMap])/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.04s) + --- PASS: TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls (0.01s) --- 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([other_mergeItemPtr_simpleMap_replacingItem_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name])/TwoWay (0.01s) - --- PASS: TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/Kind([simpleMap_replacingItem_value_other_mergeItemPtr_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name_mergingList_nonMergingList])/ThreeWay (0.00s) - --- PASS: TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/Struct/TwoWay (0.02s) + --- PASS: TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/Kind([mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other_mergingList_nonMergingList_simpleMap_retainKeysMap_name_value_nonMergingIntList])/TwoWay (0.00s) + --- PASS: TestUnknownField/discard_nulls_in_nested_and_adds_not_nulls/Kind([nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other_mergingList_nonMergingIntList_simpleMap_retainKeysMap_name_value])/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.02s) + --- 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([name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_value_other_mergeItemPtr_simpleMap_replacingItem])/TwoWay (0.00s) - --- PASS: TestUnknownField/filter_if_slice_is_all_empty/Kind([simpleMap_replacingItem_value_other_mergeItemPtr_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name_mergingList_nonMergingList])/ThreeWay (0.00s) + --- PASS: TestUnknownField/filter_if_slice_is_all_empty/Kind([retainKeysMergingList_other_mergingList_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_name_value_nonMergingIntList_simpleMap_retainKeysMap])/TwoWay (0.00s) + --- PASS: TestUnknownField/filter_if_slice_is_all_empty/Kind([nonMergingIntList_simpleMap_retainKeysMap_name_value_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other_mergingList])/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.01s) - --- PASS: TestUnknownField/filter_nulls_from_nested_slices (0.01s) + --- 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([value_other_mergeItemPtr_simpleMap_replacingItem_retainKeysMergingList_name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap])/TwoWay (0.00s) - --- PASS: TestUnknownField/filter_nulls_from_nested_slices/Kind([name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_value_other_mergeItemPtr_simpleMap_replacingItem])/ThreeWay (0.00s) + --- PASS: TestUnknownField/filter_nulls_from_nested_slices/Kind([name_value_nonMergingIntList_simpleMap_retainKeysMap_replacingItem_retainKeysMergingList_other_mergingList_nonMergingList_mergingIntList_mergeItemPtr])/TwoWay (0.00s) + --- PASS: TestUnknownField/filter_nulls_from_nested_slices/Kind([value_nonMergingIntList_simpleMap_retainKeysMap_name_mergingList_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other])/ThreeWay (0.00s) --- PASS: TestUnknownField/filter_nulls_from_nested_slices/Struct/TwoWay (0.00s) --- PASS: TestUnknownField/filter_nulls_from_nested_slices/Struct/ThreeWay (0.00s) - --- PASS: TestUnknownField/nested_null_values_in_original_are_preserved (0.02s) + --- PASS: TestUnknownField/nested_null_values_in_original_are_preserved (0.00s) --- PASS: TestUnknownField/nested_null_values_in_original_are_preserved/struct/TwoWay (0.00s) --- PASS: TestUnknownField/nested_null_values_in_original_are_preserved/struct/ThreeWay (0.00s) - --- PASS: TestUnknownField/nested_null_values_in_original_are_preserved/Kind([mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name_other_mergeItemPtr_simpleMap_replacingItem_value])/TwoWay (0.02s) - --- PASS: TestUnknownField/nested_null_values_in_original_are_preserved/Kind([value_other_mergeItemPtr_simpleMap_replacingItem_name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList])/ThreeWay (0.00s) + --- PASS: TestUnknownField/nested_null_values_in_original_are_preserved/Kind([mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other_mergingList_nonMergingList_simpleMap_retainKeysMap_name_value_nonMergingIntList])/TwoWay (0.00s) + --- PASS: TestUnknownField/nested_null_values_in_original_are_preserved/Kind([retainKeysMap_name_value_nonMergingIntList_simpleMap_mergeItemPtr_replacingItem_retainKeysMergingList_other_mergingList_nonMergingList_mergingIntList])/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.02s) - --- PASS: TestUnknownField/no_diff/struct/TwoWay (0.00s) + --- PASS: TestUnknownField/no_diff (0.01s) + --- PASS: TestUnknownField/no_diff/struct/TwoWay (0.01s) --- PASS: TestUnknownField/no_diff/struct/ThreeWay (0.00s) - --- PASS: TestUnknownField/no_diff/Kind([nonMergingIntList_retainKeysMap_retainKeysMergingList_name_mergingList_nonMergingList_mergingIntList_replacingItem_value_other_mergeItemPtr_simpleMap])/TwoWay (0.00s) - --- PASS: TestUnknownField/no_diff/Kind([mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name_mergingList_nonMergingList_simpleMap_replacingItem_value_other_mergeItemPtr])/ThreeWay (0.00s) + --- PASS: TestUnknownField/no_diff/Kind([retainKeysMergingList_other_mergingList_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_name_value_nonMergingIntList_simpleMap_retainKeysMap])/TwoWay (0.00s) + --- PASS: TestUnknownField/no_diff/Kind([nonMergingIntList_simpleMap_retainKeysMap_name_value_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other_mergingList])/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.02s) - --- PASS: TestUnknownField/no_diff_even_if_modified_null/struct/TwoWay (0.01s) + --- 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([mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name_mergingList_nonMergingList_simpleMap_replacingItem_value_other_mergeItemPtr])/TwoWay (0.00s) - --- PASS: TestUnknownField/no_diff_even_if_modified_null/Kind([value_other_mergeItemPtr_simpleMap_replacingItem_name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList])/ThreeWay (0.01s) + --- PASS: TestUnknownField/no_diff_even_if_modified_null/Kind([other_mergingList_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_value_nonMergingIntList_simpleMap_retainKeysMap])/TwoWay (0.00s) + --- PASS: TestUnknownField/no_diff_even_if_modified_null/Kind([other_mergingList_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_name_value_nonMergingIntList_simpleMap_retainKeysMap])/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.02s) + --- PASS: TestUnknownField/not_filter_nulls_from_non-associative_slice (0.01s) --- 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([retainKeysMergingList_name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_value_other_mergeItemPtr_simpleMap_replacingItem])/TwoWay (0.00s) - --- PASS: TestUnknownField/not_filter_nulls_from_non-associative_slice/Kind([name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_value_other_mergeItemPtr_simpleMap_replacingItem])/ThreeWay (0.00s) + --- PASS: TestUnknownField/not_filter_nulls_from_non-associative_slice/Kind([mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other_mergingList_nonMergingList_simpleMap_retainKeysMap_name_value_nonMergingIntList])/TwoWay (0.00s) + --- PASS: TestUnknownField/not_filter_nulls_from_non-associative_slice/Kind([mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other_mergingList_nonMergingList_simpleMap_retainKeysMap_name_value_nonMergingIntList])/ThreeWay (0.01s) --- 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.01s) - --- PASS: TestUnknownField/null_values_in_original_are_preserved (0.01s) + --- PASS: TestUnknownField/not_filter_nulls_from_non-associative_slice/Struct/ThreeWay (0.00s) + --- PASS: TestUnknownField/null_values_in_original_are_preserved (0.00s) --- PASS: TestUnknownField/null_values_in_original_are_preserved/struct/TwoWay (0.00s) --- PASS: TestUnknownField/null_values_in_original_are_preserved/struct/ThreeWay (0.00s) - --- PASS: TestUnknownField/null_values_in_original_are_preserved/Kind([name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_value_other_mergeItemPtr_simpleMap_replacingItem])/TwoWay (0.00s) - --- PASS: TestUnknownField/null_values_in_original_are_preserved/Kind([other_mergeItemPtr_simpleMap_replacingItem_value_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name])/ThreeWay (0.00s) - --- PASS: TestUnknownField/null_values_in_original_are_preserved/Struct/TwoWay (0.01s) + --- PASS: TestUnknownField/null_values_in_original_are_preserved/Kind([retainKeysMergingList_other_mergingList_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_name_value_nonMergingIntList_simpleMap_retainKeysMap])/TwoWay (0.00s) + --- PASS: TestUnknownField/null_values_in_original_are_preserved/Kind([name_value_nonMergingIntList_simpleMap_retainKeysMap_replacingItem_retainKeysMergingList_other_mergingList_nonMergingList_mergingIntList_mergeItemPtr])/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.01s) + --- 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([nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList_name_mergingList_mergeItemPtr_simpleMap_replacingItem_value_other])/TwoWay (0.00s) - --- PASS: TestUnknownField/removed_only/Kind([value_other_mergeItemPtr_simpleMap_replacingItem_name_mergingList_nonMergingList_mergingIntList_nonMergingIntList_retainKeysMap_retainKeysMergingList])/ThreeWay (0.00s) + --- PASS: TestUnknownField/removed_only/Kind([nonMergingIntList_simpleMap_retainKeysMap_name_value_nonMergingList_mergingIntList_mergeItemPtr_replacingItem_retainKeysMergingList_other_mergingList])/TwoWay (0.00s) + --- PASS: TestUnknownField/removed_only/Kind([name_value_nonMergingIntList_simpleMap_retainKeysMap_retainKeysMergingList_other_mergingList_nonMergingList_mergingIntList_mergeItemPtr_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 59.383s +ok k8s.io/apimachinery/pkg/util/strategicpatch 19.648s === RUN TestIsDNS1123Label ---- PASS: TestIsDNS1123Label (0.01s) +--- PASS: TestIsDNS1123Label (0.00s) === RUN TestIsDNS1123Subdomain --- PASS: TestIsDNS1123Subdomain (0.00s) === RUN TestIsDNS1035Label ---- PASS: TestIsDNS1035Label (0.01s) +--- PASS: TestIsDNS1035Label (0.00s) === RUN TestIsCIdentifier --- PASS: TestIsCIdentifier (0.00s) === RUN TestIsValidPortNum @@ -18211,7 +18250,7 @@ === RUN TestIsValidIP --- PASS: TestIsValidIP (0.00s) === RUN TestIsValidIPv4Address ---- PASS: TestIsValidIPv4Address (0.00s) +--- PASS: TestIsValidIPv4Address (0.01s) === RUN TestIsValidIPv6Address --- PASS: TestIsValidIPv6Address (0.00s) === RUN TestIsHTTPHeaderName @@ -18223,26 +18262,26 @@ === RUN TestIsWildcardDNS1123Subdomain --- PASS: TestIsWildcardDNS1123Subdomain (0.00s) === RUN TestIsFullyQualifiedDomainName ---- PASS: TestIsFullyQualifiedDomainName (0.01s) +--- PASS: TestIsFullyQualifiedDomainName (0.00s) === RUN TestIsFullyQualifiedName ---- PASS: TestIsFullyQualifiedName (0.01s) +--- PASS: TestIsFullyQualifiedName (0.00s) === RUN TestIsDomainPrefixedPath --- PASS: TestIsDomainPrefixedPath (0.00s) === RUN TestIsValidSocketAddr --- PASS: TestIsValidSocketAddr (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/validation 0.173s +ok k8s.io/apimachinery/pkg/util/validation 0.048s === 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)(0x207e1b0), KV:map[string]int{"Billy":2}}: detail + errors_test.go:97: message: foo: Invalid value: field.complicated{Baz:1, Qux:"aoeu", Inner:(*field.complicated)(0x8b21b0), KV:map[string]int{"Billy":2}}: detail --- PASS: TestErrorUsefulMessage (0.00s) === RUN TestToAggregate --- PASS: TestToAggregate (0.00s) === RUN TestErrListFilter ---- PASS: TestErrListFilter (0.01s) +--- PASS: TestErrListFilter (0.00s) === RUN TestNotSupported --- PASS: TestNotSupported (0.00s) === RUN TestPath @@ -18250,13 +18289,13 @@ === RUN TestPathMultiArg --- PASS: TestPathMultiArg (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/validation/field 0.082s +ok k8s.io/apimachinery/pkg/util/validation/field 0.039s === RUN TestSemanticVersions --- PASS: TestSemanticVersions (0.00s) === RUN TestBadSemanticVersions ---- PASS: TestBadSemanticVersions (0.01s) +--- PASS: TestBadSemanticVersions (0.00s) === RUN TestGenericVersions ---- PASS: TestGenericVersions (0.02s) +--- PASS: TestGenericVersions (0.00s) === RUN TestBadGenericVersions --- PASS: TestBadGenericVersions (0.00s) === RUN TestComponents @@ -18264,7 +18303,7 @@ === RUN TestHighestSupportedVersion --- PASS: TestHighestSupportedVersion (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/version 0.102s +ok k8s.io/apimachinery/pkg/util/version 0.040s === RUN TestInterrupted === RUN TestInterrupted/#00 === RUN TestInterrupted/#01 @@ -18281,7 +18320,7 @@ === RUN TestInterrupted/#12 === RUN TestInterrupted/#13 === RUN TestInterrupted/#14 ---- PASS: TestInterrupted (0.01s) +--- PASS: TestInterrupted (0.00s) --- PASS: TestInterrupted/#00 (0.00s) --- PASS: TestInterrupted/#01 (0.00s) --- PASS: TestInterrupted/#02 (0.00s) @@ -18300,7 +18339,7 @@ === RUN TestErrorInterrupted --- PASS: TestErrorInterrupted (0.00s) === RUN Test_loopConditionWithContextImmediateDelay ---- PASS: Test_loopConditionWithContextImmediateDelay (0.01s) +--- PASS: Test_loopConditionWithContextImmediateDelay (0.00s) === RUN Test_loopConditionUntilContext_semantic === RUN Test_loopConditionUntilContext_semantic/condition_successful_is_only_one_attempt === RUN Test_loopConditionUntilContext_semantic/delayed_condition_successful_causes_return_and_attempts @@ -18318,10 +18357,10 @@ === 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.66s) +--- 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.01s) + --- PASS: Test_loopConditionUntilContext_semantic/delayed_condition_successful_causes_return_and_attempts_many_times (0.00s) --- PASS: Test_loopConditionUntilContext_semantic/condition_returns_error_even_if_ok_is_true (0.00s) --- PASS: Test_loopConditionUntilContext_semantic/condition_exits_after_an_error (0.00s) --- PASS: Test_loopConditionUntilContext_semantic/context_already_canceled_no_attempts_expected (0.00s) @@ -18330,7 +18369,7 @@ --- PASS: Test_loopConditionUntilContext_semantic/context_already_canceled_and_immediate_1_attempt_expected (0.00s) --- PASS: Test_loopConditionUntilContext_semantic/context_cancelled_after_5_attempts (0.00s) --- PASS: Test_loopConditionUntilContext_semantic/context_cancelled_and_immediate_after_5_attempts (0.00s) - --- PASS: Test_loopConditionUntilContext_semantic/context_at_deadline_and_immediate_1_attempt_expected (0.01s) + --- PASS: Test_loopConditionUntilContext_semantic/context_at_deadline_and_immediate_1_attempt_expected (0.00s) --- PASS: Test_loopConditionUntilContext_semantic/context_at_deadline_no_attempts_expected (0.00s) --- PASS: Test_loopConditionUntilContext_semantic/context_canceled_before_the_second_execution_and_immediate (1.00s) --- PASS: Test_loopConditionUntilContext_semantic/immediate_and_long_duration_of_condition_and_sliding_false (0.61s) @@ -18346,14 +18385,14 @@ === RUN Test_loopConditionUntilContext_Elapsed === RUN Test_loopConditionUntilContext_Elapsed/variable_timer_with_jitter === NAME Test_loopConditionUntilContext_Elapsed - loop_test.go:503: elapsed duration 41.660302ms > expected max duration 30ms + loop_test.go:503: elapsed duration 75.381426ms > expected max duration 30ms === RUN Test_loopConditionUntilContext_Elapsed/fixed_timer === NAME Test_loopConditionUntilContext_Elapsed - loop_test.go:503: elapsed duration 23.038273ms > expected max duration 20ms + loop_test.go:503: elapsed duration 39.61997ms > expected max duration 20ms === RUN Test_loopConditionUntilContext_Elapsed/no-op_timer ---- PASS: Test_loopConditionUntilContext_Elapsed (0.07s) - --- PASS: Test_loopConditionUntilContext_Elapsed/variable_timer_with_jitter (0.04s) - --- PASS: Test_loopConditionUntilContext_Elapsed/fixed_timer (0.02s) +--- PASS: Test_loopConditionUntilContext_Elapsed (0.12s) + --- PASS: Test_loopConditionUntilContext_Elapsed/variable_timer_with_jitter (0.08s) + --- PASS: Test_loopConditionUntilContext_Elapsed/fixed_timer (0.04s) --- PASS: Test_loopConditionUntilContext_Elapsed/no-op_timer (0.00s) === RUN TestUntil --- PASS: TestUntil (0.00s) @@ -18374,7 +18413,7 @@ === RUN TestJitterUntilRecoversPanic --- PASS: TestJitterUntilRecoversPanic (0.01s) === RUN TestJitterUntilNegativeFactor ---- PASS: TestJitterUntilNegativeFactor (1.01s) +--- PASS: TestJitterUntilNegativeFactor (1.00s) === RUN TestExponentialBackoff --- PASS: TestExponentialBackoff (0.00s) === RUN TestPoller @@ -18388,7 +18427,7 @@ === RUN TestPollImmediateError --- PASS: TestPollImmediateError (0.00s) === RUN TestPollForever ---- PASS: TestPollForever (0.00s) +--- PASS: TestPollForever (0.04s) === RUN Test_waitFor --- PASS: Test_waitFor (0.00s) === RUN Test_waitForWithEarlyClosing_waitFunc @@ -18396,9 +18435,9 @@ === RUN Test_waitForWithClosedChannel --- PASS: Test_waitForWithClosedChannel (0.00s) === RUN Test_waitForWithContextCancelsContext ---- PASS: Test_waitForWithContextCancelsContext (0.01s) +--- PASS: Test_waitForWithContextCancelsContext (0.02s) === RUN TestPollUntil ---- PASS: TestPollUntil (0.01s) +--- PASS: TestPollUntil (0.00s) === RUN TestBackoff_Step === RUN TestBackoff_Step/(*wait.Backoff)(nil)_seed=0 wait_test.go:688: [0]=0s @@ -18600,7 +18639,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.07s) +--- PASS: TestBackoff_Step (0.01s) --- 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) @@ -18636,13 +18675,13 @@ --- PASS: TestBackoff_Step/&wait.Backoff{Duration:1000000000,_Factor:2,_Jitter:0,_Steps:3,_Cap:0}_seed=3 (0.00s) --- PASS: TestBackoff_Step/&wait.Backoff{Duration:1000000000,_Factor:2,_Jitter:0,_Steps:3,_Cap:3000000000}_seed=3 (0.00s) --- PASS: TestBackoff_Step/&wait.Backoff{Duration:1000000000,_Factor:2,_Jitter:0.5,_Steps:2,_Cap:3000000000}_seed=3 (0.00s) - --- PASS: TestBackoff_Step/&wait.Backoff{Duration:1000000000,_Factor:2,_Jitter:4,_Steps:6,_Cap:0}_seed=3 (0.01s) + --- PASS: TestBackoff_Step/&wait.Backoff{Duration:1000000000,_Factor:2,_Jitter:4,_Steps:6,_Cap:0}_seed=3 (0.00s) --- PASS: TestBackoff_Step/(*wait.Backoff)(nil)_seed=4 (0.00s) --- PASS: TestBackoff_Step/&wait.Backoff{Duration:1000000000,_Factor:0,_Jitter:0,_Steps:-1,_Cap:0}_seed=4 (0.00s) --- PASS: TestBackoff_Step/&wait.Backoff{Duration:1000000000,_Factor:0,_Jitter:0,_Steps:0,_Cap:0}_seed=4 (0.00s) --- PASS: TestBackoff_Step/&wait.Backoff{Duration:1000000000,_Factor:0,_Jitter:0,_Steps:1,_Cap:0}_seed=4 (0.00s) --- PASS: TestBackoff_Step/&wait.Backoff{Duration:1000000000,_Factor:1,_Jitter:0,_Steps:1,_Cap:0}_seed=4 (0.00s) - --- PASS: TestBackoff_Step/&wait.Backoff{Duration:1000000000,_Factor:2,_Jitter:0,_Steps:3,_Cap:0}_seed=4 (0.01s) + --- PASS: TestBackoff_Step/&wait.Backoff{Duration:1000000000,_Factor:2,_Jitter:0,_Steps:3,_Cap:0}_seed=4 (0.00s) --- PASS: TestBackoff_Step/&wait.Backoff{Duration:1000000000,_Factor:2,_Jitter:0,_Steps:3,_Cap:3000000000}_seed=4 (0.00s) --- PASS: TestBackoff_Step/&wait.Backoff{Duration:1000000000,_Factor:2,_Jitter:0.5,_Steps:2,_Cap:3000000000}_seed=4 (0.00s) --- PASS: TestBackoff_Step/&wait.Backoff{Duration:1000000000,_Factor:2,_Jitter:4,_Steps:6,_Cap:0}_seed=4 (0.00s) @@ -18683,7 +18722,7 @@ === RUN TestExponentialBackoffWithContext/condition_returns_error_no_further_attempts_expected#01 === RUN TestExponentialBackoffWithContext/context_already_canceled_no_attempts_expected#01 === RUN TestExponentialBackoffWithContext/context_at_deadline_no_attempts_expected#01 ---- PASS: TestExponentialBackoffWithContext (0.02s) +--- PASS: TestExponentialBackoffWithContext (0.01s) --- PASS: TestExponentialBackoffWithContext/no_attempts_expected_with_zero_backoff_steps (0.00s) --- PASS: TestExponentialBackoffWithContext/condition_returns_false_with_single_backoff_step (0.00s) --- PASS: TestExponentialBackoffWithContext/condition_returns_true_with_single_backoff_step (0.00s) @@ -18691,7 +18730,7 @@ --- PASS: TestExponentialBackoffWithContext/condition_returns_true_after_certain_attempts_with_multiple_backoff_steps (0.00s) --- PASS: TestExponentialBackoffWithContext/condition_returns_error_no_further_attempts_expected (0.00s) --- PASS: TestExponentialBackoffWithContext/context_already_canceled_no_attempts_expected (0.00s) - --- PASS: TestExponentialBackoffWithContext/context_at_deadline_no_attempts_expected (0.01s) + --- PASS: TestExponentialBackoffWithContext/context_at_deadline_no_attempts_expected (0.00s) --- PASS: TestExponentialBackoffWithContext/no_attempts_expected_with_zero_backoff_steps#01 (0.00s) --- PASS: TestExponentialBackoffWithContext/condition_returns_false_with_single_backoff_step#01 (0.00s) --- PASS: TestExponentialBackoffWithContext/condition_returns_true_with_single_backoff_step#01 (0.00s) @@ -18706,7 +18745,7 @@ === 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.03s) +--- PASS: TestPollImmediateUntilWithContext (0.02s) --- 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) @@ -18735,7 +18774,7 @@ === RUN Test_poll/condition_always_returns_false,_timeout_error_expected === RUN Test_poll/context_is_cancelled_after_N_attempts,_timeout_error_expected === RUN Test_poll/context_is_cancelled_after_N_attempts,_context_error_not_expected_(legacy_behavior) ---- PASS: Test_poll (0.02s) +--- PASS: Test_poll (0.00s) --- PASS: Test_poll/immediate_is_true,_condition_returns_an_error (0.00s) --- PASS: Test_poll/immediate_is_true,_condition_returns_true (0.00s) --- PASS: Test_poll/immediate_is_true,_context_is_cancelled,_condition_return_false (0.00s) @@ -18749,25 +18788,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.261s +ok k8s.io/apimachinery/pkg/util/wait 4.120s === RUN TestRateLimitedSafeWaitGroup ---- PASS: TestRateLimitedSafeWaitGroup (2.16s) +--- 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-01-22 17:25:41.519479662 +0000 UTC m=+2.195394617 - ratelimited_waitgroup_test.go:255: Wait finished, count(before): 200, count(after): 0, took: 4.978742066s, err: + ratelimited_waitgroup_test.go:247: Wait starting, N=200, grace: 5s, at: 2024-01-22 17:43:08.928454573 +0000 UTC m=+2.128344186 + ratelimited_waitgroup_test.go:255: Wait finished, count(before): 200, count(after): 0, took: 4.979103165s, 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.280s +ok k8s.io/apimachinery/pkg/util/waitgroup 7.131s === RUN TestYAMLDecoderReadBytesLength --- PASS: TestYAMLDecoderReadBytesLength (0.00s) === RUN TestBigYAML ---- PASS: TestBigYAML (3.55s) +--- PASS: TestBigYAML (0.88s) === RUN TestYAMLDecoderCallsAfterErrShortBufferRestOfFrame --- PASS: TestYAMLDecoderCallsAfterErrShortBufferRestOfFrame (0.00s) === RUN TestSplitYAMLDocument @@ -18780,7 +18819,7 @@ decoder_test.go:178: scan: --- PASS: TestScanYAML (0.00s) === RUN TestDecodeYAML ---- PASS: TestDecodeYAML (0.01s) +--- PASS: TestDecodeYAML (0.00s) === RUN TestDecodeYAMLSeparatorValidation --- PASS: TestDecodeYAMLSeparatorValidation (0.00s) === RUN TestDecodeBrokenYAML @@ -18789,17 +18828,17 @@ === RUN TestDecodeBrokenJSON --- PASS: TestDecodeBrokenJSON (0.00s) === RUN TestYAMLOrJSONDecoder ---- PASS: TestYAMLOrJSONDecoder (0.02s) +--- PASS: TestYAMLOrJSONDecoder (0.01s) === RUN TestReadSingleLongLine ---- PASS: TestReadSingleLongLine (0.13s) +--- PASS: TestReadSingleLongLine (0.05s) === RUN TestReadRandomLineLengths ---- PASS: TestReadRandomLineLengths (4.40s) +--- PASS: TestReadRandomLineLengths (2.34s) === RUN TestTypedJSONOrYamlErrors --- PASS: TestTypedJSONOrYamlErrors (0.00s) === RUN TestUnmarshal --- PASS: TestUnmarshal (0.00s) PASS -ok k8s.io/apimachinery/pkg/util/yaml 8.269s +ok k8s.io/apimachinery/pkg/util/yaml 3.331s === RUN TestCompareKubeAwareVersionStrings --- PASS: TestCompareKubeAwareVersionStrings (0.00s) === RUN Test_parseKubeVersion @@ -18815,7 +18854,7 @@ --- PASS: Test_parseKubeVersion/beta_version (0.00s) --- PASS: Test_parseKubeVersion/ga_version (0.00s) PASS -ok k8s.io/apimachinery/pkg/version 0.044s +ok k8s.io/apimachinery/pkg/version 0.033s ? k8s.io/apimachinery/third_party/forked/golang/netutil [no test files] === RUN TestBroadcaster mux_test.go:86: Sending 0 @@ -18825,16 +18864,16 @@ 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) === RUN TestBroadcasterWatcherClose --- PASS: TestBroadcasterWatcherClose (0.00s) === RUN TestBroadcasterWatcherStopDeadlock ---- PASS: TestBroadcasterWatcherStopDeadlock (0.01s) +--- PASS: TestBroadcasterWatcherStopDeadlock (0.00s) === RUN TestBroadcasterDropIfChannelFull mux_test.go:167: Sending event 1 mux_test.go:169: Sending event 2 @@ -18849,7 +18888,7 @@ === RUN TestBroadcasterShutdownRace mux_test.go:268: Stopping Watchers mux_test.go:268: Stopping Watchers ---- PASS: TestBroadcasterShutdownRace (0.01s) +--- PASS: TestBroadcasterShutdownRace (0.00s) === RUN TestFilter --- PASS: TestFilter (0.00s) === RUN TestFilterStop @@ -18871,17 +18910,17 @@ === RUN TestProxyWatcher --- PASS: TestProxyWatcher (0.00s) PASS -ok k8s.io/apimachinery/pkg/watch 0.142s +ok k8s.io/apimachinery/pkg/watch 0.080s === RUN TestLookupPtrToStruct --- PASS: TestLookupPtrToStruct (0.00s) PASS -ok k8s.io/apimachinery/third_party/forked/golang/json 0.069s +ok k8s.io/apimachinery/third_party/forked/golang/json 0.020s === RUN TestEqualities --- PASS: TestEqualities (0.00s) === RUN TestDerivatives --- PASS: TestDerivatives (0.00s) PASS -ok k8s.io/apimachinery/third_party/forked/golang/reflect 0.030s +ok k8s.io/apimachinery/third_party/forked/golang/reflect 0.043s create-stamp debian/debhelper-build-stamp dh_testroot -O--builddirectory=_build -O--buildsystem=golang dh_prep -O--builddirectory=_build -O--buildsystem=golang @@ -18908,12 +18947,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/16561/tmp/hooks/B01_cleanup starting +I: user script /srv/workspace/pbuilder/16561/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/12112 and its subdirectories -I: Current time: Mon Jan 22 05:29:14 -12 2024 -I: pbuilder-time-stamp: 1705944554 +I: removing directory /srv/workspace/pbuilder/16561 and its subdirectories +I: Current time: Tue Jan 23 07:44:30 +14 2024 +I: pbuilder-time-stamp: 1705945470