diff options
| author | Ed Santiago <santiago@redhat.com> | 2022-06-08 13:41:43 -0600 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2022-06-08 19:33:07 -0600 |
| commit | bce97a3b5dd1477c74232b49d246491aa289a995 (patch) | |
| tree | c1258a578d6126df68210c1e3edb332ef63be22a /test/apiv2/15-manifest.at | |
| parent | 576c739e5ff01c760b383a258c62ed3ca7e1c30c (diff) | |
| download | podman-bce97a3b5dd1477c74232b49d246491aa289a995.tar.gz podman-bce97a3b5dd1477c74232b49d246491aa289a995.tar.bz2 podman-bce97a3b5dd1477c74232b49d246491aa289a995.zip | |
apiv2 tests: clean up
Mostly fix a bad design decision I made early on, re: registry.
old: registry starts once, runs to the end
new: registry is brought up on demand, then stopped
Reason: there are times when we need a password-controlled
registry, and times when we need it open.
As long as I'm in here, I've also cleaned up some confusing code
and fixed things so tests can run rootless again.
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test/apiv2/15-manifest.at')
| -rw-r--r-- | test/apiv2/15-manifest.at | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/test/apiv2/15-manifest.at b/test/apiv2/15-manifest.at index 65ce41e7d..970bed5a8 100644 --- a/test/apiv2/15-manifest.at +++ b/test/apiv2/15-manifest.at @@ -27,10 +27,6 @@ RUN >file2 EOF ) -function cleanUpManifestTest() { - podman rmi -a -} - t POST /v3.4.0/libpod/manifests/$id_abc/add images="[\"containers-storage:$id_abc_image\"]" 200 t PUT /v4.0.0/libpod/manifests/$id_xyz operation='update' images="[\"containers-storage:$id_xyz_image\"]" 200 @@ -41,4 +37,5 @@ t POST "/v4.0.0/libpod/manifests/xyz:latest/registry/localhost:$REGISTRY_PORT%2F t DELETE /v4.0.0/libpod/manifests/$id_abc 200 t DELETE /v4.0.0/libpod/manifests/$id_xyz 200 -cleanUpManifestTest +podman rmi -a +stop_registry |