Fix potential issue with 'odo describe component' integration tests w…

…hen Podman is installed When running locally with Podman installed, the error message no longer contains the reference to the namespace.
redhat-developer · Mar 8, 2023 · 91b2808 · 91b2808
1 parent 9c592c4
commit 91b2808
Showing 1 changed file with 43 additions and 5 deletions.
diff --git a/tests/integration/cmd_describe_component_test.go b/tests/integration/cmd_describe_component_test.go
@@ -67,19 +67,36 @@ var _ = Describe("odo describe component command tests", func() {
 		})
 	}
 
-	It("should fail, with cluster", func() {
+	It("should fail, with default cluster mode", func() {
 		By("running odo describe component -o json with an unknown name", func() {
 			res := helper.Cmd("odo", "describe", "component", "--name", "unknown-name", "-o", "json").ShouldFail()
 			stdout, stderr := res.Out(), res.Err()
 			Expect(helper.IsJSON(stderr)).To(BeTrue())
 			Expect(stdout).To(BeEmpty())
-			helper.JsonPathContentContain(stderr, "message", "no component found with name \"unknown-name\" in the namespace \""+commonVar.Project+"\"")
+			helper.JsonPathContentContain(stderr, "message", "no component found with name \"unknown-name\"")
 		})
 
 		By("running odo describe component with an unknown name", func() {
 			res := helper.Cmd("odo", "describe", "component", "--name", "unknown-name").ShouldFail()
 			stdout, stderr := res.Out(), res.Err()
 			Expect(stdout).To(BeEmpty())
+			Expect(stderr).To(ContainSubstring("no component found with name \"unknown-name\""))
+		})
+	})
+
+	It("should fail, with cluster", func() {
+		By("running odo describe component -o json with an unknown name", func() {
+			res := helper.Cmd("odo", "describe", "component", "--name", "unknown-name", "--platform", "cluster", "-o", "json").ShouldFail()
+			stdout, stderr := res.Out(), res.Err()
+			Expect(helper.IsJSON(stderr)).To(BeTrue())
+			Expect(stdout).To(BeEmpty())
+			helper.JsonPathContentContain(stderr, "message", "no component found with name \"unknown-name\" in the namespace \""+commonVar.Project+"\"")
+		})
+
+		By("running odo describe component with an unknown name", func() {
+			res := helper.Cmd("odo", "describe", "component", "--name", "unknown-name", "--platform", "cluster").ShouldFail()
+			stdout, stderr := res.Out(), res.Err()
+			Expect(stdout).To(BeEmpty())
 			Expect(stderr).To(ContainSubstring("no component found with name \"unknown-name\" in the namespace \"" + commonVar.Project + "\""))
 		})
 	})
@@ -197,15 +214,15 @@ var _ = Describe("odo describe component command tests", func() {
 			})
 		}
 
-		It("should not describe the component from another directory", func() {
+		It("should not describe the component from another directory, with default cluster mode", func() {
 			By("running with json output", func() {
 				err := os.Chdir("/")
 				Expect(err).NotTo(HaveOccurred())
 				res := helper.Cmd("odo", "describe", "component", "--name", cmpName, "-o", "json").ShouldFail()
 				stdout, stderr := res.Out(), res.Err()
 				Expect(helper.IsJSON(stderr)).To(BeTrue())
 				Expect(stdout).To(BeEmpty())
-				helper.JsonPathContentContain(stderr, "message", "no component found with name \""+cmpName+"\" in the namespace \""+commonVar.Project+"\"")
+				helper.JsonPathContentContain(stderr, "message", "no component found with name \""+cmpName+"\"")
 			})
 
 			By("running with default output", func() {
@@ -214,7 +231,28 @@ var _ = Describe("odo describe component command tests", func() {
 				res := helper.Cmd("odo", "describe", "component", "--name", cmpName).ShouldFail()
 				stdout, stderr := res.Out(), res.Err()
 				Expect(stdout).To(BeEmpty())
-				Expect(stderr).To(ContainSubstring("no component found with name \"" + cmpName + "\" in the namespace \"" + commonVar.Project + "\""))
+				Expect(stderr).To(ContainSubstring("no component found with name %q", cmpName))
+			})
+		})
+
+		It("should not describe the component from another directory, with cluster", func() {
+			By("running with json output", func() {
+				err := os.Chdir("/")
+				Expect(err).NotTo(HaveOccurred())
+				res := helper.Cmd("odo", "describe", "component", "--name", cmpName, "-o", "json", "--platform", "cluster").ShouldFail()
+				stdout, stderr := res.Out(), res.Err()
+				Expect(helper.IsJSON(stderr)).To(BeTrue())
+				Expect(stdout).To(BeEmpty())
+				helper.JsonPathContentContain(stderr, "message", "no component found with name \""+cmpName+"\" in the namespace \""+commonVar.Project+"\"")
+			})
+
+			By("running with default output", func() {
+				err := os.Chdir("/")
+				Expect(err).NotTo(HaveOccurred())
+				res := helper.Cmd("odo", "describe", "component", "--name", cmpName, "--platform", "cluster").ShouldFail()
+				stdout, stderr := res.Out(), res.Err()
+				Expect(stdout).To(BeEmpty())
+				Expect(stderr).To(ContainSubstring("no component found with name %q in the namespace %q", cmpName, commonVar.Project))
 			})
 		})