Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add --compat-auth-file to login and logout #5143

Merged
merged 4 commits into from
Nov 17, 2023
+9,605 −4,256
Merged

Add --compat-auth-file to login and logout #5143

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5fc64af
Update c/image and c/common to latest
mtrmac Nov 7, 2023
dcfbe69
Update existing tests for error message change
mtrmac Nov 8, 2023
57d863d
Add support for --compat-auth-file in login/logout
mtrmac Nov 7, 2023
4cf1673
Increase a copier+chroot test timeout
mtrmac Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Increase a copier+chroot test timeout 
Warning: I don't know what I'm doing, I just don't care
to deal with this now.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
@mtrmac
mtrmac committed Nov 16, 2023
commit 4cf16730b12da2e3d36ae25b8db552cacce573af
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -192,7 +192,7 @@ tests/testreport/testreport: tests/testreport/testreport.go
.PHONY: test-unit
test-unit: tests/testreport/testreport
$(GO_TEST) -v -tags "$(STORAGETAGS) $(SECURITYTAGS)" -cover $(RACEFLAGS) $(shell $(GO) list ./... | grep -v vendor | grep -v tests | grep -v cmd | grep -v chroot | grep -v copier) -timeout 45m
$(GO_TEST) -v -tags "$(STORAGETAGS) $(SECURITYTAGS)" $(RACEFLAGS) ./chroot ./copier -timeout 45m
$(GO_TEST) -v -tags "$(STORAGETAGS) $(SECURITYTAGS)" $(RACEFLAGS) ./chroot ./copier -timeout 60m
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note this unrelated change. The tests keep timing out, so I just bumped the maximum.

One recent success took 47m.

It would probably be worthwhile to spend some time speeding up the tests, but that’s not this PR.

tmp=$(shell mktemp -d) ; \
mkdir -p $$tmp/root $$tmp/runroot; \
$(GO_TEST) -v -tags "$(STORAGETAGS) $(SECURITYTAGS)" -cover $(RACEFLAGS) ./cmd/buildah -args --root $$tmp/root --runroot $$tmp/runroot --storage-driver vfs --signature-policy $(shell pwd)/tests/policy.json --registries-conf $(shell pwd)/tests/registries.conf