diff options
| author | Ed Santiago <santiago@redhat.com> | 2020-05-26 05:18:16 -0600 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2020-05-26 08:21:46 -0600 |
| commit | b81b865b5287fd07b4e6fb73753cab788ae76edc (patch) | |
| tree | a3c3144b9ab030c5327c0d4dbea2ea7d422d6008 /Makefile | |
| parent | 1077d2d0b72d027a01080c0d3ebdb7d99a969661 (diff) | |
| download | podman-b81b865b5287fd07b4e6fb73753cab788ae76edc.tar.gz podman-b81b865b5287fd07b4e6fb73753cab788ae76edc.tar.bz2 podman-b81b865b5287fd07b4e6fb73753cab788ae76edc.zip | |
podman-registry: many unrelated fixes
1) fix lost credentials.
must_pass(), added in #6375, eats the credentials
generated via 'podman run --entrypoint htpasswd'.
Run that podman instance directly, and add explicit
error check.
(The error and stdout/stderr handling here has gotten
cumbersome. There must be something I'm missing that
could make it all simpler.)
2) fix default podman path.
When setting $PODMAN, default to the locally built
one -- there may not be one in $PATH (e.g. in
Ubuntu, see #6366). This in turn requires us to:
3) run registry test in integration, not unit test
It looks like unit tests run before podman is built,
causing a chicken-egg dilemma. Try to solve that by
running the new hack/podman-registry-go test in
integration tests, not unit tests.
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -318,7 +318,7 @@ localunit: test/goecho/goecho varlink_generate ginkgo \ -r \ $(TESTFLAGS) \ - --skipPackage test/e2e,pkg/apparmor,test/endpoint,pkg/bindings \ + --skipPackage test/e2e,pkg/apparmor,test/endpoint,pkg/bindings,hack \ --cover \ --covermode atomic \ --tags "$(BUILDTAGS)" \ @@ -326,7 +326,7 @@ localunit: test/goecho/goecho varlink_generate .PHONY: ginkgo ginkgo: - ginkgo -v $(TESTFLAGS) -tags "$(BUILDTAGS)" $(GINKGOTIMEOUT) -cover -flakeAttempts 3 -progress -trace -noColor -nodes 3 -debug test/e2e/. + ginkgo -v $(TESTFLAGS) -tags "$(BUILDTAGS)" $(GINKGOTIMEOUT) -cover -flakeAttempts 3 -progress -trace -noColor -nodes 3 -debug test/e2e/. hack/. .PHONY: ginkgo-remote ginkgo-remote: |