summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-05-31 21:30:18 +0200
committerGitHub <noreply@github.com>2019-05-31 21:30:18 +0200
commit503ed5fe0319c6a673f3ad43b00aacf2199bcf74 (patch)
tree6c58e2a4fc145e46ec1247e47904436096b584a2
parent38c4a1322dafb36dffb5bfba82c6684091a77607 (diff)
parent25aac813bd88478961b60eda2a3ede7fcf5adef9 (diff)
downloadpodman-503ed5fe0319c6a673f3ad43b00aacf2199bcf74.tar.gz
podman-503ed5fe0319c6a673f3ad43b00aacf2199bcf74.tar.bz2
podman-503ed5fe0319c6a673f3ad43b00aacf2199bcf74.zip
Merge pull request #3246 from mheon/run_the_tests
Small fix to readme to force tests to run
-rw-r--r--README.md1
-rw-r--r--test/e2e/cp_test.go10
2 files changed, 6 insertions, 5 deletions
diff --git a/README.md b/README.md
index 820ce7dc8..64af6a120 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,7 @@ At a high level, the scope of libpod and Podman is the following:
* Full management of container lifecycle
* Support for pods to manage groups of containers together
* Resource isolation of containers and pods.
+* Support for a Docker-compatible CLI interface through Podman.
* Integration with CRI-O to share containers and backend code.
This project tests all builds against each supported version of Fedora, the latest released version of Red Hat Enterprise Linux, and the latest Ubuntu Long Term Support release. The community has also reported success with other Linux flavors.
diff --git a/test/e2e/cp_test.go b/test/e2e/cp_test.go
index 983d61b58..597d0aef7 100644
--- a/test/e2e/cp_test.go
+++ b/test/e2e/cp_test.go
@@ -163,16 +163,16 @@ var _ = Describe("Podman cp", func() {
})
It("podman cp symlink", func() {
- srcPath := filepath.Join(podmanTest.RunRoot, "cp_test.txt")
- fromHostToContainer := []byte("copy from host to container")
- err := ioutil.WriteFile(srcPath, fromHostToContainer, 0644)
- Expect(err).To(BeNil())
-
session := podmanTest.Podman([]string{"run", "-d", ALPINE, "top"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
name := session.OutputToString()
+ srcPath := filepath.Join(podmanTest.RunRoot, "cp_test.txt")
+ fromHostToContainer := []byte("copy from host to container")
+ err := ioutil.WriteFile(srcPath, fromHostToContainer, 0644)
+ Expect(err).To(BeNil())
+
session = podmanTest.Podman([]string{"exec", name, "ln", "-s", "/tmp", "/test"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))