Merge pull request #14703 from cdoern/connection

fix system connection and scp testing

2 files changed, 21 insertions, 24 deletions

diff --git a/test/e2e/image_scp_test.go b/test/e2e/image_scp_test.go
index 2ad3cc75e..53681f05b 100644
--- a/test/e2e/image_scp_test.go
+++ b/test/e2e/image_scp_test.go
@@ -22,12 +22,10 @@ var _ = Describe("podman image scp", func() {
 	)
 
 	BeforeEach(func() {
-
 		ConfPath.Value, ConfPath.IsSet = os.LookupEnv("CONTAINERS_CONF")
 		conf, err := ioutil.TempFile("", "containersconf")
-		if err != nil {
-			panic(err)
-		}
+		Expect(err).ToNot(HaveOccurred())
+
 		os.Setenv("CONTAINERS_CONF", conf.Name())
 		tempdir, err = CreateTempDirInTempDir()
 		if err != nil {
@@ -57,7 +55,7 @@ var _ = Describe("podman image scp", func() {
 		}
 		scp := podmanTest.Podman([]string{"image", "scp", "FOOBAR"})
 		scp.WaitWithDefaultTimeout()
-		Expect(scp).To(ExitWithError())
+		Expect(scp).Should(ExitWithError())
 	})
 
 	It("podman image scp with proper connection", func() {
@@ -67,27 +65,28 @@ var _ = Describe("podman image scp", func() {
 		cmd := []string{"system", "connection", "add",
 			"--default",
 			"QA",
-			"ssh://root@server.fubar.com:2222/run/podman/podman.sock",
+			"ssh://root@podman.test:2222/run/podman/podman.sock",
 		}
 		session := podmanTest.Podman(cmd)
 		session.WaitWithDefaultTimeout()
-		Expect(session).To(Exit(0))
+		Expect(session).Should(Exit(0))
 
 		cfg, err := config.ReadCustomConfig()
 		Expect(err).ShouldNot(HaveOccurred())
-		Expect(cfg.Engine).To(HaveField("ActiveService", "QA"))
+		Expect(cfg.Engine).Should(HaveField("ActiveService", "QA"))
 		Expect(cfg.Engine.ServiceDestinations).To(HaveKeyWithValue("QA",
 			config.Destination{
-				URI: "ssh://root@server.fubar.com:2222/run/podman/podman.sock",
+				URI: "ssh://root@podman.test:2222/run/podman/podman.sock",
 			},
 		))
 
 		scp := podmanTest.Podman([]string{"image", "scp", ALPINE, "QA::"})
-		scp.Wait(45)
+		scp.WaitWithDefaultTimeout()
 		// exit with error because we cannot make an actual ssh connection
 		// This tests that the input we are given is validated and prepared correctly
-		// The error given should either be a missing image (due to testing suite complications) or a i/o timeout on ssh
-		Expect(scp).To(ExitWithError())
+		// The error given should either be a missing image (due to testing suite complications) or a no such host timeout on ssh
+		Expect(scp).Should(ExitWithError())
+		Expect(scp.ErrorToString()).Should(ContainSubstring("no such host"))
 
 	})
 
diff --git a/test/e2e/system_connection_test.go b/test/e2e/system_connection_test.go
index 8f755e692..baa31424b 100644
--- a/test/e2e/system_connection_test.go
+++ b/test/e2e/system_connection_test.go
@@ -47,9 +47,7 @@ var _ = Describe("podman system connection", func() {
 		}
 
 		f := CurrentGinkgoTestDescription()
-		_, _ = GinkgoWriter.Write(
-			[]byte(
-				fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds())))
+		processTestResult(f)
 	})
 
 	Context("without running API service", func() {
@@ -58,7 +56,7 @@ var _ = Describe("podman system connection", func() {
 				"--default",
 				"--identity", "~/.ssh/id_rsa",
 				"QA",
-				"ssh://root@server.fubar.com:2222/run/podman/podman.sock",
+				"ssh://root@podman.test:2222/run/podman/podman.sock",
 			}
 			session := podmanTest.Podman(cmd)
 			session.WaitWithDefaultTimeout()
@@ -67,10 +65,10 @@ var _ = Describe("podman system connection", func() {
 
 			cfg, err := config.ReadCustomConfig()
 			Expect(err).ShouldNot(HaveOccurred())
-			Expect(cfg).To(HaveActiveService("QA"))
+			Expect(cfg).Should(HaveActiveService("QA"))
 			Expect(cfg).Should(VerifyService(
 				"QA",
-				"ssh://root@server.fubar.com:2222/run/podman/podman.sock",
+				"ssh://root@podman.test:2222/run/podman/podman.sock",
 				"~/.ssh/id_rsa",
 			))
 
@@ -82,7 +80,7 @@ var _ = Describe("podman system connection", func() {
 			session.WaitWithDefaultTimeout()
 			Expect(session).Should(Exit(0))
 
-			Expect(config.ReadCustomConfig()).To(HaveActiveService("QE"))
+			Expect(config.ReadCustomConfig()).Should(HaveActiveService("QE"))
 		})
 
 		It("add UDS", func() {
@@ -141,7 +139,7 @@ var _ = Describe("podman system connection", func() {
 				"--default",
 				"--identity", "~/.ssh/id_rsa",
 				"QA",
-				"ssh://root@server.fubar.com:2222/run/podman/podman.sock",
+				"ssh://root@podman.test:2222/run/podman/podman.sock",
 			})
 			session.WaitWithDefaultTimeout()
 			Expect(session).Should(Exit(0))
@@ -155,8 +153,8 @@ var _ = Describe("podman system connection", func() {
 
 				cfg, err := config.ReadCustomConfig()
 				Expect(err).ShouldNot(HaveOccurred())
-				Expect(cfg.Engine.ActiveService).To(BeEmpty())
-				Expect(cfg.Engine.ServiceDestinations).To(BeEmpty())
+				Expect(cfg.Engine.ActiveService).Should(BeEmpty())
+				Expect(cfg.Engine.ServiceDestinations).Should(BeEmpty())
 			}
 		})
 
@@ -165,7 +163,7 @@ var _ = Describe("podman system connection", func() {
 				"--default",
 				"--identity", "~/.ssh/id_rsa",
 				"QA",
-				"ssh://root@server.fubar.com:2222/run/podman/podman.sock",
+				"ssh://root@podman.test:2222/run/podman/podman.sock",
 			})
 			session.WaitWithDefaultTimeout()
 			Expect(session).Should(Exit(0))
@@ -187,7 +185,7 @@ var _ = Describe("podman system connection", func() {
 					"--default",
 					"--identity", "~/.ssh/id_rsa",
 					name,
-					"ssh://root@server.fubar.com:2222/run/podman/podman.sock",
+					"ssh://root@podman.test:2222/run/podman/podman.sock",
 				}
 				session := podmanTest.Podman(cmd)
 				session.WaitWithDefaultTimeout()