summaryrefslogtreecommitdiff
path: root/test
Commit message (Collapse)AuthorAge
* tests: clean up FIXMEs and noiseEd Santiago2021-12-06
| | | | | | | | | | | | | | | | | e2e tests: * remove two FIXMEs: * one of them is expected behavior, not a FIXME * the other is easily fixed * File issue #12521 for a real podman-remote bug, and update the Skip() message system tests: * in command-completion test, clean up stray podman-pause image (followup to #12322, in which I missed this instance). This removes distracting warnings from test logs. Signed-off-by: Ed Santiago <santiago@redhat.com>
* Merge pull request #12487 from jwhonce/issues/10974-2OpenShift Merge Robot2021-12-06
|\ | | | | Refactor podman system to report.Formatter
| * Refactor podman system to report.FormatterJhon Honce2021-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Support better compatibility output for podman system commands * Format and content of output from podman version changed to be more compatible See #10974 Depends on containers/common#831 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | vendor c/common@mainValentin Rothberg2021-12-06
| | | | | | | | | | | | | | | | | | Update the `--filter reference=...` tests to reflect recent changes in c/common. The reference values now match as specified without implicitly adding wildcards arounds. Fixes: #11905 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #12466 from ↵OpenShift Merge Robot2021-12-03
|\ \ | |/ |/| | | | | dispensable/respect_pod_yaml_spec_hostname_when_play Hostname in `spec.hostname` should be passed to infra ctr init opt
| * Hostname in `spec.hostname` should be passed to infra ctr init optwangqiang2021-12-01
| | | | | | | | | | | | Fixes https://github.com/containers/podman/issues/12393 Signed-off-by: Qiang Wang <sunsetmask@gmail.com>
* | Merge pull request #12440 from umohnani8/cmOpenShift Merge Robot2021-12-03
|\ \ | | | | | | Add support for configmap volumes to play kube
| * | Add support for configmap volumes to play kubeUrvashi Mohnani2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the k8s yaml has volumes from a configmap, play kube will now create a volume based on the data from the configmap and volume source and set it to the right path in the container accordingly. Add tests for this and update some test for ENV from configmap. Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
* | | Add restart-sec option to systemd generateOndra Machacek2021-12-03
| | | | | | | | | | | | Signed-off-by: Ondra Machacek <omachace@redhat.com>
* | | Merge pull request #12482 from edsantiago/e2e_haveOpenShift Merge Robot2021-12-02
|\ \ \ | | | | | | | | e2e tests: use HaveKey() and HaveLen() when possible
| * | | Manual fixesEd Santiago2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a handful of instances not covered by earlier automated replacements. Found via: ack 'Expect\(len' test/e2e There are still a bunch of BeNumerically(">", ...) that cannot (yet) be handled by HaveLen(). Leave those as they are. Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | | Same thing, with BeNumerically("==", x)Ed Santiago2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | sed -i -e 's/Expect(len(\(.*\)))\.To(BeNumerically("==", \(.*\)))/Expect(\1).To(HaveLen(\2))/' test/e2e/*.go Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | | Use HaveLen(x) instead of Expect(len(y)).To(Equal(x))Ed Santiago2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | sed -i -e 's/Expect(len(\(.*\)))\.To(Equal(\(.*\)))/Expect(\1).To(HaveLen(\2))/' test/e2e/*.go Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | | Same thing, for BeNumerically("==", 0)Ed Santiago2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | sed -i -e 's/Expect(len(\(.*\)))\.To(BeNumerically("==", 0))/Expect(\1).To(BeEmpty())/' test/e2e/*.go Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | | Use BeEmpty() instead of len(x).To(Equal(0))Ed Santiago2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | sed -i -e 's/Expect(len(\(.*\)))\.To(Equal(0))/Expect(\1).To(BeEmpty())/' test/e2e/*.go Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | | Same as previous, for assertions other than Equal()Ed Santiago2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | sed -i -e 's/Expect(\(.*\)\[\(\".*\"\)\])\.To(\(.*\)/Expect(\1).To(HaveKeyWithValue(\2, \3)/' test/e2e/*_test.go Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | | e2e tests: a little more minor cleanupEd Santiago2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sed -i -e 's/Expect(\(.*\)\[\(\".*\"\)\])\.To(Equal(/Expect(\1).To(HaveKeyWithValue(\2, /' test/e2e/*_test.go ...with two manual tweaks, because this converted: Expect(foo["bar"]).To(Equal("")) -> Expect(foo).To(HaveKeyWithValue("bar","")) It looks like the intention of the test was, instead: ...To(Not(HaveKey("bar"))) Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #12455 from jwhonce/issues/10974OpenShift Merge Robot2021-12-02
|\ \ \ \ | | | | | | | | | | Refactor podman image command output
| * | | | Refactor podman image command outputJhon Honce2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leverage new report.Formatter allowing better compatibility from podman command output. Follow on PR's will cover containers, etc. See #10974 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | Merge pull request #12480 from vrothberg/fix-12453OpenShift Merge Robot2021-12-02
|\ \ \ \ \ | |_|/ / / |/| | | | compat: images/json
| * | | | compat: images/jsonValentin Rothberg2021-12-02
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Do not list manifest lists. Docker doesn't either. Fixes: #12453 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #12471 from edsantiago/e2e_tmpdir_cleanupOpenShift Merge Robot2021-12-02
|\ \ \ \ | |/ / / |/| | | e2e tmpdir cleanup
| * | | remove ARTIFACT_DIR and ArtifactPathEd Santiago2021-12-01
| | | | | | | | | | | | | | | | | | | | | | | | ...they're not actually used for anything Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | | Image caches: allow overriding cache dirEd Santiago2021-12-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Images were being cached in /tmp, with no option to override. Now $PODMAN_TEST_IMAGE_CACHE_DIR can be used to point to a user-preferred location. If unset, try $TMPDIR before settling on /tmp. Also: refactor the logic for determining the tarball name. Also: include registry name in tarball name. Also: clean up unused/unnecessary code Also: do not echo "Restoring..." if we're not actually restoring. Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | | Rename CrioRoot as just RootEd Santiago2021-12-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ...and remove other uses of "crio". They're confusing and misleading. (I'm sure it made sense at one time) Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #12458 from edsantiago/remove_betrueOpenShift Merge Robot2021-12-01
|\ \ \ \ | | | | | | | | | | e2e: yet more cleanup of BeTrue/BeFalse
| * | | | e2e: yet more cleanup of BeTrue/BeFalseEd Santiago2021-11-30
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Thanks to Paul for teaching me about HaveKey() Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #12307 from hshiina/device-weightOpenShift Merge Robot2021-12-01
|\ \ \ \ | | | | | | | | | | Implement 'podman run --blkio-weight-device'
| * | | | Implement 'podman run --blkio-weight-device'Hironori Shiina2021-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `--blkio-weight-device` is not fully implemented and this causes an unexpected panic when specified because an entry is put into an uninitialized map at parsing. This fix implements the `--blkio-weight-device` and adds a system test. When creating a spec generator on a client, a major number and a minor number of a device cannot be set. So, these numbers are inspected on a server and set to a runtime spec. Signed-off-by: Hironori Shiina <shiina.hironori@jp.fujitsu.com>
* | | | | Merge pull request #12450 from giuseppe/compression-formatOpenShift Merge Robot2021-12-01
|\ \ \ \ \ | |_|_|/ / |/| | | | podman, push: expose --compression-format
| * | | | podman, push: expose --compression-formatGiuseppe Scrivano2021-12-01
| |/ / / | | | | | | | | | | | | | | | | | | | | support overriding the compression format at push time. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #12462 from vrothberg/fix-12452OpenShift Merge Robot2021-12-01
|\ \ \ \ | |_|/ / |/| | | top: parse ps(1) args correctly
| * | | top: parse ps(1) args correctlyValentin Rothberg2021-12-01
| |/ / | | | | | | | | | | | | | | | | | | The arguments of ps(1) should be shlexed. Fixes: #12452 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #12454 from edsantiago/remove_betrueOpenShift Merge Robot2021-11-30
|\ \ \ | | | | | | | | More BeTrue cleanup
| * | | a few more manual BeTrue cleanupsEd Santiago2021-11-30
| | | | | | | | | | | | | | | | Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | | Convert strings.Contains() to Expect(ContainSubstring)Ed Santiago2021-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ...done manually, not via sed, because some of the inner expressions include nested commas. Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | | e2e tests: more cleanup of BeTrue()sEd Santiago2021-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Write a BeValidJSON() matcher, and replace IsJSONOutputValid(): sed -i -e 's/Expect(\(.*\)\.IsJSONOutputValid()).To(BeTrue())/Expect(\1.OutputToString())\.To(BeValidJSON())/' test/e2e/*_test.go (Plus a few manual tweaks) Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #12414 from flouthoc/api-allow-secretsOpenShift Merge Robot2021-11-30
|\ \ \ \ | |/ / / |/| | | tunnel: allow `remote` and `API` to accept `--secrets`
| * | | podman-remote: prevent leaking secret into imageAditya Rajan2021-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents temp secrets leaking into image by moving it away from context directory to parent builder directory. Builder directory automatically gets cleaned up when we are done with the build. Signed-off-by: Aditya Rajan <arajan@redhat.com>
| * | | podman-remote: copy secret to contextdir is absolute path on hostAditya Rajan2021-11-30
| |/ / | | | | | | | | | | | | | | | | | | | | | Podman remote must treat build secrets as part of context directory. If secret path is absolute path on host copy it to tar file and pass it to remote server. Signed-off-by: Aditya Rajan <arajan@redhat.com>
* | | Merge pull request #12449 from vrothberg/fix-12438OpenShift Merge Robot2021-11-30
|\ \ \ | | | | | | | | systemd: replace multi-user with default.target
| * | | systemd: replace multi-user with default.targetValentin Rothberg2021-11-30
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace `multi-user.target` with `default.target` across the code base. It seems like the multi-user one is not available for (rootless) users on F35 anymore is causing issues in all kinds of ways, for instance, enabling the podman.service or generated systemd units. Fixes: #12438 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* / / compat API: allow enforcing short-names resolution to Docker HubValentin Rothberg2021-11-30
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Docker-compatible REST API has historically behaved just as the rest of Podman and Buildah (and the atomic Docker in older RHEL/Fedora) where `containers-registries.conf` is centrally controlling which registries a short name may resolve to during pull or local image lookups. Please refer to a blog for more details [1]. Docker, however, is only resolving short names to docker.io which has been reported (see #12320) to break certain clients who rely on this behavior. In order to support this scenario, `containers.conf(5)` received a new option to control whether Podman's compat API resolves to docker.io only or behaves as before. Most endpoints allow for directly normalizing parameters that represent an image. If set in containers.conf, Podman will then normalize the references directly to docker.io. The build endpoint is an outlier since images are also referenced in Dockerfiles. The Buildah API, however, supports specifying a custom `types.SystemContext` in which we can set a field that enforces short-name resolution to docker.io in `c/image/pkg/shortnames`. Notice that this a "hybrid" approach of doing the normalization directly in the compat endpoints *and* in `pkg/shortnames` by passing a system context. Doing such a hybrid approach is neccessary since the compat and the libpod endpoints share the same `libimage.Runtime` which makes a global enforcement via the `libimage.Runtime.systemContext` impossible. Having two separate runtimes for the compat and the libpod endpoints seems risky and not generally applicable to all endpoints. [1] https://www.redhat.com/sysadmin/container-image-short-names Fixes: #12320 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #12433 from matejvasek/fix-mount-parsingOpenShift Merge Robot2021-11-29
|\ \ | | | | | | fix: parsing of HostConfig.Mounts for container create
| * | fix: parsing of HostConfig.Mounts for container createMatej Vasek2021-11-29
| | | | | | | | | | | | Signed-off-by: Matej Vasek <mvasek@redhat.com>
* | | e2e tests: enable golintEd Santiago2021-11-29
|/ / | | | | | | | | | | ...and fix problems found therewith. Signed-off-by: Ed Santiago <santiago@redhat.com>
* / fix: error reporting for archive endpointMatej Vasek2021-11-28
|/ | | | | | Returning 500 when copying to read-only destination. Signed-off-by: Matej Vasek <mvasek@redhat.com>
* libpod: improve heuristic to detect cgroupGiuseppe Scrivano2021-11-24
| | | | | | | | | | | improve the heuristic to detect the scope that was created for the container. This is necessary with systemd running as PID 1, since it moves itself to a different sub-cgroup, thus stats would not account for other processes in the same container. Closes: https://github.com/containers/podman/issues/12400 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* Merge pull request #12398 from edsantiago/remove_betrueOpenShift Merge Robot2021-11-24
|\ | | | | continue e2e test cleanup
| * Find and fix empty Expect()sEd Santiago2021-11-23
| | | | | | | | | | | | | | | | | | | | | | | | That previous commit made me wonder if there are any other instances of Expect() with no assertions. grep Expect test/e2e/*_test.go |egrep -v '\.(To|NotTo|Should)' ...finds a couple of handfuls, most of which are OK (continued on the next line) but a few of which are bugs. Fix those. Signed-off-by: Ed Santiago <santiago@redhat.com>