Skip to content

Commit 4ff6e91

Browse files
committed
Fix Multiuser Test Environment
- Remove logging cleanup in test that doesn't exist in 7.22.x - Bring in xattr package for test - Add alice user to Dockerfile
1 parent 88af02c commit 4ff6e91

4 files changed

Lines changed: 12 additions & 2 deletions

File tree

e2e_fed_tests/multiuser_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import (
3939
"github.com/pelicanplatform/pelican/fed_test_utils"
4040
"github.com/pelicanplatform/pelican/param"
4141
"github.com/pelicanplatform/pelican/server_utils"
42-
"github.com/pelicanplatform/pelican/test_utils"
4342
"github.com/pelicanplatform/pelican/token"
4443
"github.com/pelicanplatform/pelican/token_scopes"
4544
)
@@ -113,7 +112,6 @@ func TestOriginMultiuser(t *testing.T) {
113112
t.Skip("Skipping multiuser test: user 'alice' does not exist")
114113
}
115114

116-
t.Cleanup(test_utils.SetupTestLogging(t))
117115
server_utils.ResetTestState()
118116
defer server_utils.ResetTestState()
119117

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ require (
8484
github.com/muesli/reflow v0.3.0 // indirect
8585
github.com/muesli/termenv v0.15.3-0.20240618155329-98d742f6907a // indirect
8686
github.com/oschwald/maxminddb-golang/v2 v2.0.0-beta.9 // indirect
87+
github.com/pkg/xattr v0.4.12 // indirect
8788
github.com/redis/go-redis/v9 v9.0.2 // indirect
8889
github.com/sagikazarmark/locafero v0.6.0 // indirect
8990
github.com/sethvargo/go-retry v0.2.4 // indirect

go.sum

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -628,6 +628,8 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
628628
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
629629
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
630630
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
631+
github.com/pkg/xattr v0.4.12 h1:rRTkSyFNTRElv6pkA3zpjHpQ90p/OdHQC1GmGh1aTjM=
632+
github.com/pkg/xattr v0.4.12/go.mod h1:di8WF84zAKk8jzR1UBTEWh9AUlIZZ7M/JNt8e9B6ktU=
631633
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=
632634
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
633635
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -968,6 +970,7 @@ golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7w
968970
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
969971
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
970972
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
973+
golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
971974
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
972975
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
973976
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

images/Dockerfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -637,6 +637,14 @@ RUN --mount=type=cache,id=dnf-${TARGETPLATFORM},target=/var/cache/dnf,sharing=lo
637637
rm -f ./minio.rpm
638638
ENDRUN
639639

640+
# Create alice user for multi-user testing
641+
RUN <<ENDRUN
642+
set -eux
643+
set -o pipefail
644+
645+
useradd -m -s /bin/bash alice
646+
ENDRUN
647+
640648
ENTRYPOINT []
641649
CMD ["/bin/bash"]
642650
WORKDIR /app

0 commit comments

Comments
 (0)