Simplify mysql tunnel setup in test helpers

[#160768145]
pivotal-cf · Sep 26, 2018 · dc0bd8e · dc0bd8e
1 parent cc88330
commit dc0bd8e
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/test_helpers/test_helpers.go b/test_helpers/test_helpers.go
@@ -381,17 +381,11 @@ func waitForTunnel(port int, serviceKey ServiceKey) {
  serviceKey.Name,
  )
 
- Eventually(func() error {
- db, err := sql.Open("mysql", connectionString)
- if err != nil {
- return err
- }
- defer func() {
- e := db.Close()
- Expect(e).NotTo(HaveOccurred())
- }()
+ db, err := sql.Open("mysql", connectionString)
+ Expect(err).NotTo(HaveOccurred())
+ defer db.Close()
 
-  _, err = db.Exec("SELECT 1")
- return err
+ Eventually(func() error {
+ return db.Ping()
  }, "1m", "5s").Should(Not(HaveOccurred()))
 }