Refactored the logs tests in hoverctl functional tests

Author: benjih

functional-tests/hoverctl/logs_test.go

@@ -20,45 +20,41 @@ var _ = Describe("When I use hoverctl", func() {
 		proxyPort = strconv.Itoa(freeport.GetPort())
 	)
 
-	Context("I can get the logs using the log command", func() {
+	BeforeEach(func() {
+		WriteConfiguration("localhost", adminPort, proxyPort)
+	})
 
-		BeforeEach(func() {
-			exec.Command(hoverctlBinary, "start", "--admin-port=" + adminPort, "--proxy-port=" + proxyPort).Output()
-			WriteConfiguration("localhost", adminPort, proxyPort)
-		})
+	AfterEach(func() {
+		exec.Command(hoverctlBinary, "stop", "--admin-port=" + adminPort, "--proxy-port=" + proxyPort).Output()
+	})
 
-		AfterEach(func() {
-			exec.Command(hoverctlBinary, "stop", "--admin-port=" + adminPort, "--proxy-port=" + proxyPort).Output()
-		})
+	Context("I can get the logs using the log command", func() {
 
 		It("should return the logs", func() {
+			exec.Command(hoverctlBinary, "start", "--admin-port=" + adminPort, "--proxy-port=" + proxyPort).Output()
+
 			out, _ := exec.Command(hoverctlBinary, "logs", "--admin-port=" + adminPort, "--proxy-port=" + proxyPort).Output()
 
 			output := strings.TrimSpace(string(out))
 			Expect(output).To(ContainSubstring("listening on :" + adminPort))
 		})
 
 		It("should return an error if the logs don't exist", func() {
+			exec.Command(hoverctlBinary, "start", "--admin-port=" + adminPort, "--proxy-port=" + proxyPort).Output()
+			
 			out, _ := exec.Command(hoverctlBinary, "logs", "--admin-port=hotdogs", "--proxy-port=burgers").Output()
 
 			output := strings.TrimSpace(string(out))
 			Expect(output).To(ContainSubstring("Could not open Hoverfly log file"))
 		})
 	})
 
-	Describe("and start Hoverfly using hoverctl", func() {
+	Context("and start Hoverfly using hoverctl", func() {
 
 		Context("the logs get captured in a .log file", func() {
-			BeforeEach(func() {
+			It("and I can see it has started", func() {
 				exec.Command(hoverctlBinary, "start", "--admin-port=" + adminPort, "--proxy-port=" + proxyPort).Output()
-				WriteConfiguration("localhost", adminPort, proxyPort)
-			})
-
-			AfterEach(func() {
-				exec.Command(hoverctlBinary, "stop", "--admin-port=" + adminPort, "--proxy-port=" + proxyPort).Output()
-			})
 
-			It("and I can see it has started", func() {
 				workingDir, _ := os.Getwd()
 				filePath := filepath.Join(workingDir, ".hoverfly/", "hoverfly." + adminPort + "." + proxyPort +".log")
 
@@ -69,6 +65,7 @@ var _ = Describe("When I use hoverctl", func() {
 			})
 
 			It("and they get updated when you use hoverfly", func() {
+				exec.Command(hoverctlBinary, "start", "--admin-port=" + adminPort, "--proxy-port=" + proxyPort).Output()
 
 				adminPortAsString, _ := strconv.Atoi(adminPort)
 
@@ -85,6 +82,8 @@ var _ = Describe("When I use hoverctl", func() {
 			})
 
 			It("and the stderr is captured in the log file", func() {
+				exec.Command(hoverctlBinary, "start", "--admin-port=" + adminPort, "--proxy-port=" + proxyPort).Output()
+
 				req := sling.New().Post(fmt.Sprintf("http://localhost:%v/api/state", adminPort)).Body(strings.NewReader(`{"mode":"not-a-mode"}`))
 				DoRequest(req)