use predefined port for syslog server

random ports are conflicting with some ports in use [#117078735] Signed-off-by: Evan Short <[email protected]>
vmware-archive · Apr 6, 2016 · 245e3a6 · 245e3a6
1 parent 4341c60
commit 245e3a6
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/integration/blackbox.go b/integration/blackbox.go
@@ -7,6 +7,7 @@ import (
 	"os"
 	"os/exec"
 
+	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"gopkg.in/yaml.v2"
 
@@ -33,21 +34,25 @@ func NewSyslogServer(inbox *Inbox) *SyslogServer {
 }
 
 func (s *SyslogServer) Start() {
-	l, err := net.Listen("tcp", ":0")
+	port := fmt.Sprintf("%d", 9090+GinkgoParallelNode())
+	l, err := net.Listen("tcp", ":"+port)
 	Expect(err).NotTo(HaveOccurred())
 	l.Close()
 
-	_, port, err := net.SplitHostPort(l.Addr().String())
-	Expect(err).NotTo(HaveOccurred())
-
 	addr := fmt.Sprintf("127.0.0.1:%s", port)
-	s.server.Listen(addr)
+	err = s.server.Listen(addr)
+	Expect(err).NotTo(HaveOccurred())
 
 	s.Addr = addr
 }
 
 func (s *SyslogServer) Stop() {
 	s.server.Shutdown()
+	Eventually(func() error {
+		_, err := net.Dial("tcp", s.Addr)
+		return err
+	}).ShouldNot(BeNil())
+
 	s.Addr = ""
 }