From 011f7a037eebf64da674aa4d8722cf6ff04f8a9a Mon Sep 17 00:00:00 2001 From: Patrick Dewey Date: Sat, 18 Apr 2026 14:34:43 -0400 Subject: [PATCH] chore: switch to chrysalis for testpds --- go.mod | 17 ++--------------- go.sum | 36 ++++------------------------------- nix/default.nix | 2 +- tests/integration/harness.go | 8 ++++---- tests/integration/pds_test.go | 12 ++++++------ 5 files changed, 17 insertions(+), 58 deletions(-) diff --git a/go.mod b/go.mod index 410d383..f5a7ec3 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module tangled.org/arabica.social/arabica go 1.26.1 -replace github.com/haileyok/cocoon => github.com/ptdewey/cocoon v0.0.0-20260406233545-539d73959ca6 - require ( github.com/XSAM/otelsql v0.41.0 github.com/a-h/templ v0.3.1001 @@ -26,21 +24,17 @@ require ( golang.org/x/sync v0.20.0 gorm.io/gorm v1.31.1 modernc.org/sqlite v1.48.1 - tangled.org/pdewey.com/atp v0.0.0-20260412220944-ab8db352c13e + tangled.org/pdewey.com/atp v0.0.0-20260418015135-962c7a9ed37e + tangled.org/pdewey.com/chrysalis v0.0.0-20260418015724-ffe63f2b6114 ) require ( - github.com/Azure/go-autorest v14.2.0+incompatible // indirect - github.com/Azure/go-autorest/autorest/to v0.4.1 // indirect github.com/RussellLuo/slidingwindow v0.0.0-20200528002341-535bb99d338b // indirect - github.com/aws/aws-sdk-go v1.55.8 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 // indirect github.com/cenkalti/backoff/v5 v5.0.3 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.1 // indirect - github.com/domodwyer/mailyak/v3 v3.6.2 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/earthboundkid/versioninfo/v2 v2.24.1 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect @@ -59,13 +53,8 @@ require ( github.com/golang-jwt/jwt/v5 v5.3.0 // indirect github.com/golang/snappy v1.0.0 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/gorilla/context v1.1.2 // indirect - github.com/gorilla/securecookie v1.1.2 // indirect - github.com/gorilla/sessions v1.4.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect - github.com/haileyok/cocoon v0.0.0-00010101000000-000000000000 // indirect github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect - github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-retryablehttp v0.7.8 // indirect github.com/hashicorp/golang-lru v1.0.2 // indirect @@ -96,10 +85,8 @@ require ( github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/klauspost/cpuid/v2 v2.3.0 // indirect github.com/kortschak/utter v1.7.0 // indirect - github.com/labstack/echo-contrib v0.50.1 // indirect github.com/labstack/echo/v4 v4.15.1 // indirect github.com/labstack/gommon v0.4.2 // indirect github.com/leodido/go-urn v1.4.0 // indirect diff --git a/go.sum b/go.sum index fc8b876..f3e17a5 100644 --- a/go.sum +++ b/go.sum @@ -37,10 +37,6 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= -github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest/autorest/to v0.4.1 h1:CxNHBqdzTr7rLtdrtb5CMjJcDut+WNGCVv7OmS5+lTc= -github.com/Azure/go-autorest/autorest/to v0.4.1/go.mod h1:EtaofgU4zmtvn1zT2ARsjRFdq9vXx0YWtmElwL+GZ9M= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/RussellLuo/slidingwindow v0.0.0-20200528002341-535bb99d338b h1:5/++qT1/z812ZqBvqQt6ToRswSuPZ/B33m6xVHRzADU= @@ -55,8 +51,6 @@ github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kd github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.55.8 h1:JRmEUbU52aJQZ2AjX4q4Wu7t4uZjOu71uyNmaWlUkJQ= -github.com/aws/aws-sdk-go v1.55.8/go.mod h1:ZkViS9AqA6otK+JBBNH2++sx1sgxrPKcSzPPvQkUtXk= github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o= github.com/benbjohnson/clock v1.3.5/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -69,8 +63,6 @@ github.com/bluesky-social/indigo v0.0.0-20260409212512-2031017ff411 h1:zi+cbEqTe github.com/bluesky-social/indigo v0.0.0-20260409212512-2031017ff411/go.mod h1:JqQkz8lrOI6YZivP38GHmtVOTtzsNToITKj1gMpU5Jo= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= -github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 h1:R8vQdOQdZ9Y3SkEwmHoWBmX1DNXhXZqlTpq6s4tyJGc= -github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= github.com/cenkalti/backoff/v5 v5.0.3 h1:ZN+IMa753KfX5hd8vVaMixjnqRZ3y8CuJKRKj1xcsSM= github.com/cenkalti/backoff/v5 v5.0.3/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -95,8 +87,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.1 h1:5RVFMOWjMyRy8cARdy79nAmgYw3hK/4HUq48LQ6Wwqo= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.1/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40= -github.com/domodwyer/mailyak/v3 v3.6.2 h1:x3tGMsyFhTCaxp6ycgR0FE/bu5QiNp+hetUuCOBXMn8= -github.com/domodwyer/mailyak/v3 v3.6.2/go.mod h1:lOm/u9CyCVWHeaAmHIdF4RiKVxKUT/H5XX10lIKAL6c= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/earthboundkid/versioninfo/v2 v2.24.1 h1:SJTMHaoUx3GzjjnUO1QzP3ZXK6Ee/nbWyCm58eY3oUg= @@ -208,8 +198,6 @@ github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= -github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -235,12 +223,6 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g= github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k= -github.com/gorilla/context v1.1.2 h1:WRkNAv2uoa03QNIc1A6u4O7DAGMUVoopZhkiXWA2V1o= -github.com/gorilla/context v1.1.2/go.mod h1:KDPwT9i/MeWHiLl90fuTgrt4/wPcv75vFAZLaOOcbxM= -github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA= -github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo= -github.com/gorilla/sessions v1.4.0 h1:kpIYOp/oi6MG/p5PgxApU8srsSw9tuFbt46Lt7auzqQ= -github.com/gorilla/sessions v1.4.0/go.mod h1:FLWm50oby91+hl7p/wRxDth9bWSuk0qVL2emc7lT5ik= github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= @@ -248,8 +230,6 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 h1:HWRh5R2+9EifMyIHV7ZV+MIZqgz github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0/go.mod h1:JfhWUomR1baixubs02l85lZYYOm7LV6om4ceouMv45c= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= -github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b h1:wDUNC2eKiL35DbLvsDhiblTUXHxcOPwQSCzi7xpQUN4= -github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b/go.mod h1:VzxiSdG6j1pi7rwGm/xYI5RbtpBgM8sARDXlvEvxlu0= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -360,10 +340,6 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= -github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= -github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= -github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= @@ -389,8 +365,6 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/labstack/echo-contrib v0.50.1 h1:W9cZZ9viA4TDdFtm8cuA+XGFwOcnfbjJpl7VgfsRLHE= -github.com/labstack/echo-contrib v0.50.1/go.mod h1:8r/++U/Fw/QniApFnzunLanKaviPfBX7fX7/2QX0qOk= github.com/labstack/echo/v4 v4.15.1 h1:S9keusg26gZpjMmPqB5hOEvNKnmd1lNmcHrbbH2lnFs= github.com/labstack/echo/v4 v4.15.1/go.mod h1:xmw1clThob0BSVRX1CRQkGQ/vjwcpOMjQZSZa9fKA/c= github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0= @@ -502,8 +476,6 @@ github.com/prometheus/common v0.67.5 h1:pIgK94WWlQt1WLwAC5j2ynLaBRDiinoAb86HZHTU github.com/prometheus/common v0.67.5/go.mod h1:SjE/0MzDEEAyrdr5Gqc6G+sXI67maCxzaT3A2+HqjUw= github.com/prometheus/procfs v0.20.1 h1:XwbrGOIplXW/AU3YhIhLODXMJYyC1isLFfYCsTEycfc= github.com/prometheus/procfs v0.20.1/go.mod h1:o9EMBZGRyvDrSPH1RqdxhojkuXstoe4UlK79eF5TGGo= -github.com/ptdewey/cocoon v0.0.0-20260406233545-539d73959ca6 h1:3URO0yVKaLABwX30ZPB55IANOddOQ/igRU9TiXvCSB8= -github.com/ptdewey/cocoon v0.0.0-20260406233545-539d73959ca6/go.mod h1:bJXZ7+Fq4HN0mLteTsDhp22/br2siOdEL7bAAKl5YDo= github.com/ptdewey/shutter v0.2.1 h1:Xly9ZsgOm+SRDf3pyMWLcJRJWpQNkyh777zW8T9QpIo= github.com/ptdewey/shutter v0.2.1/go.mod h1:teeIXF4LdgsE9E4kjHk9nGzDxl2cjdbVb1qbdzAHSR4= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= @@ -1065,7 +1037,7 @@ modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -tangled.org/pdewey.com/atp v0.0.0-20260412024836-2795bc15b775 h1:0+cKQFnOepiZrkZnGP8F45cCBf83/9FLXMX4FvqcUqU= -tangled.org/pdewey.com/atp v0.0.0-20260412024836-2795bc15b775/go.mod h1:Vsfo53wETUM7mlnZqhr9HrGB6/yoqhbpXjwWqp+ZjOA= -tangled.org/pdewey.com/atp v0.0.0-20260412220944-ab8db352c13e h1:ISWAtPN74Y7EN7sl6yruNlKqF8ifZcOAaCPzGiCHU54= -tangled.org/pdewey.com/atp v0.0.0-20260412220944-ab8db352c13e/go.mod h1:Vsfo53wETUM7mlnZqhr9HrGB6/yoqhbpXjwWqp+ZjOA= +tangled.org/pdewey.com/atp v0.0.0-20260418015135-962c7a9ed37e h1:c0oSKSKpIaHqH1ZphJvFckycI54fYxsjGvaSaChGn/0= +tangled.org/pdewey.com/atp v0.0.0-20260418015135-962c7a9ed37e/go.mod h1:pHNLqyO+epfTv2xN7PWj4Aejt4ADa4u8tdFUqRQl998= +tangled.org/pdewey.com/chrysalis v0.0.0-20260418015724-ffe63f2b6114 h1:8ZO9ofX00vwf82nPTa9UgE9nCICHxzkJOFOULLqlXQY= +tangled.org/pdewey.com/chrysalis v0.0.0-20260418015724-ffe63f2b6114/go.mod h1:RxrHMM9hwsufUQ/ds1eZPwgXwBymtvktX5Z0VpNTtaU= diff --git a/nix/default.nix b/nix/default.nix index 6bccfdd..1bec293 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -4,7 +4,7 @@ buildGoModule { pname = "arabica"; version = "0.1.0"; src = ../.; - vendorHash = "sha256-ih1Qf18TyIyfa48FKq9RPokhGmy/4p3oF4fVTFec5HI="; + vendorHash = "sha256-2bvt0TQvVaRbj/Rd2+m1Hdt+AmK7WB8ZGhQWEynXTtw="; nativeBuildInputs = [ templ tailwindcss ]; diff --git a/tests/integration/harness.go b/tests/integration/harness.go index 61a78ab..204f6bd 100644 --- a/tests/integration/harness.go +++ b/tests/integration/harness.go @@ -30,13 +30,13 @@ import ( "github.com/stretchr/testify/require" gormlogger "gorm.io/gorm/logger" "tangled.org/pdewey.com/atp" - "tangled.org/pdewey.com/atp/testpds" + "tangled.org/pdewey.com/chrysalis/testpds" ) func init() { - // Cocoon constructs its gorm sessions with `&gorm.Config{}` (no Logger), + // Chrysalis constructs its gorm sessions with `&gorm.Config{}` (no Logger), // so each session falls back to gormlogger.Default. Replace it with one - // that ignores ErrRecordNotFound — cocoon's preflight existence checks + // that ignores ErrRecordNotFound — chrysalis's preflight existence checks // (handle/email/seq lookups on a fresh test DB) otherwise spam yellow // "record not found" warnings on every test run. gormlogger.Default = gormlogger.New( @@ -155,7 +155,7 @@ func StartHarness(t *testing.T, opts *HarnessOptions) *Harness { opts.PrimaryPassword = "hunter2" } - pds := testpds.Start(t, nil) + pds := testpds.StartT(t, nil) // Build an in-process FeedIndex (SQLite, temp dir) to back the witness // cache and the suggestion endpoint. This is the same type production diff --git a/tests/integration/pds_test.go b/tests/integration/pds_test.go index 797f60a..35d4366 100644 --- a/tests/integration/pds_test.go +++ b/tests/integration/pds_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "tangled.org/pdewey.com/atp" - "tangled.org/pdewey.com/atp/testpds" + "tangled.org/pdewey.com/chrysalis/testpds" ) // testAccount holds credentials for a test PDS account. @@ -86,7 +86,7 @@ func newTestStore(t *testing.T, pdsURL string, acct testAccount) *atproto.Atprot } func TestPDS_RoasterCRUD(t *testing.T) { - pds := testpds.Start(t, nil) + pds := testpds.StartT(t, nil) acct := createAccount(t, pds.URL, "alice@test.com", "alice.test", "hunter2") store := newTestStore(t, pds.URL, acct) ctx := context.Background() @@ -137,7 +137,7 @@ func TestPDS_RoasterCRUD(t *testing.T) { } func TestPDS_BeanWithRoasterRef(t *testing.T) { - pds := testpds.Start(t, nil) + pds := testpds.StartT(t, nil) acct := createAccount(t, pds.URL, "bob@test.com", "bob.test", "hunter2") store := newTestStore(t, pds.URL, acct) ctx := context.Background() @@ -169,7 +169,7 @@ func TestPDS_BeanWithRoasterRef(t *testing.T) { } func TestPDS_GrinderCRUD(t *testing.T) { - pds := testpds.Start(t, nil) + pds := testpds.StartT(t, nil) acct := createAccount(t, pds.URL, "carol@test.com", "carol.test", "hunter2") store := newTestStore(t, pds.URL, acct) ctx := context.Background() @@ -189,7 +189,7 @@ func TestPDS_GrinderCRUD(t *testing.T) { } func TestPDS_BrewerCRUD(t *testing.T) { - pds := testpds.Start(t, nil) + pds := testpds.StartT(t, nil) acct := createAccount(t, pds.URL, "dave@test.com", "dave.test", "hunter2") store := newTestStore(t, pds.URL, acct) ctx := context.Background() @@ -207,7 +207,7 @@ func TestPDS_BrewerCRUD(t *testing.T) { } func TestPDS_FullBrewSession(t *testing.T) { - pds := testpds.Start(t, nil) + pds := testpds.StartT(t, nil) acct := createAccount(t, pds.URL, "eve@test.com", "eve.test", "hunter2") store := newTestStore(t, pds.URL, acct) ctx := context.Background() -- 2.51.2