Browse Source

Enable "run->rm" cycle on e2e-aci

Signed-off-by: Ulysses Souza <[email protected]>
Ulysses Souza 5 years ago
parent
commit
b98f45eb28
2 changed files with 25 additions and 26 deletions
  1. 2 1
      cli/cmd/rm.go
  2. 23 25
      tests/aci-e2e/e2e-aci.go

+ 2 - 1
cli/cmd/rm.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"fmt"
 	"strings"
 
 	"github.com/pkg/errors"
@@ -34,7 +35,7 @@ func RmCommand() *cobra.Command {
 					errs = append(errs, err.Error())
 					continue
 				}
-				println(id)
+				fmt.Println(id)
 			}
 
 			if len(errs) > 0 {

+ 23 - 25
tests/aci-e2e/e2e-aci.go

@@ -64,31 +64,29 @@ func main() {
 		Expect(len(Lines(output))).To(Equal(1))
 	})
 
-	/*
-		var nginxID string
-		It("runs nginx on port 80", func() {
-			NewDockerCommand("run", "nginx", "-p", "80:80").ExecOrDie()
-			output := NewDockerCommand("ps").ExecOrDie()
-			Lines := Lines(output)
-			Expect(len(Lines)).To(Equal(2))
-
-			containerFields := Columns(Lines[1])
-			nginxID = containerFields[0]
-			Expect(containerFields[1]).To(Equal("nginx"))
-			Expect(containerFields[2]).To(Equal("Running"))
-			exposedIP := containerFields[3]
-			Expect(exposedIP).To(ContainSubstring(":80->80/TCP"))
-
-			url := strings.ReplaceAll(exposedIP, "->80/TCP", "")
-			output = NewCommand("curl", url).ExecOrDie()
-			Expect(output).To(ContainSubstring("Welcome to nginx!"))
-		})
-
-		It("removes container nginx", func() {
-			output := NewDockerCommand("rm", nginxID).ExecOrDie()
-			Expect(Lines(output)[0]).To(Equal(nginxID))
-		})
-	*/
+	var nginxID string
+	It("runs nginx on port 80 (PORT NOT CHECKED YET!!! REMOVE THAT WHEN IMPLEMENTED)", func() {
+		NewDockerCommand("run", "nginx", "-p", "80:80").ExecOrDie()
+		output := NewDockerCommand("ps").ExecOrDie()
+		lines := Lines(output)
+		Expect(len(lines)).To(Equal(2))
+
+		containerFields := Columns(lines[1])
+		nginxID = containerFields[0]
+		Expect(containerFields[1]).To(Equal("nginx"))
+		Expect(containerFields[2]).To(Equal("Running"))
+		// exposedIP := containerFields[3]
+		// Expect(exposedIP).To(ContainSubstring(":80->80/TCP"))
+
+		// url := strings.ReplaceAll(exposedIP, "->80/TCP", "")
+		// output = NewCommand("curl", url).ExecOrDie()
+		// Expect(output).To(ContainSubstring("Welcome to nginx!"))
+	})
+
+	It("removes container nginx", func() {
+		output := NewDockerCommand("rm", nginxID).ExecOrDie()
+		Expect(Lines(output)[0]).To(Equal(nginxID))
+	})
 
 	It("deploys a compose app", func() {
 		NewDockerCommand("compose", "up", "-f", "./tests/composefiles/aci-demo/aci_demo_port.yaml", "--name", "acidemo").ExecOrDie()