wait longer for tests to start (#1568)

* wait longer * tweak
mrhenry · May 26, 2023 · 1db27a1 · 1db27a1
1 parent aeee9f8
commit 1db27a1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/scripts/browserstack/selenium.go b/scripts/browserstack/selenium.go
@@ -321,6 +321,15 @@ func runSeleniumTest(wd selenium.WebDriver, port int, test Test) Test {
  }
 
  // First check if the page loaded and has our content before waiting for async tests
+ err = wd.WaitWithTimeoutAndInterval(selenium.Condition(func(wd1 selenium.WebDriver) (bool, error) {
+ return getBoolFromWebDriver(wd1, `return (typeof window.testLoaded !== "undefined");`)
+ }), time.Second*60, time.Second)
+ if err != nil {
+ test.end = time.Now()
+ test.err = err
+ return test
+ }
+
  loaded, err := getBoolFromWebDriver(wd, `return window.testLoaded;`)
  if err != nil {
  test.end = time.Now()

diff --git a/scripts/browserstack/workers.go b/scripts/browserstack/workers.go
@@ -69,7 +69,7 @@ type WorkerConfig struct {
 }
 
 func (x *Client) NewWorker(parentCtx context.Context, config WorkerConfig) (*Worker, error) {
- ctx, cancel := context.WithTimeout(parentCtx, time.Second*5)
+ ctx, cancel := context.WithTimeout(parentCtx, time.Second*10)
  defer cancel()
 
  params := map[string]interface{}{}
@@ -165,7 +165,7 @@ func (x *Client) NewWorker(parentCtx context.Context, config WorkerConfig) (*Wor
 }
 
 func (x *Client) DeleteWorker(parentCtx context.Context, id int) (bool, error) {
- ctx, cancel := context.WithTimeout(parentCtx, time.Second*5)
+ ctx, cancel := context.WithTimeout(parentCtx, time.Second*10)
  defer cancel()
 
  req, err := http.NewRequestWithContext(ctx, http.MethodDelete, fmt.Sprintf("https://api.browserstack.com/5/worker/%d", id), nil)
@@ -207,7 +207,7 @@ func (x *Client) DeleteWorker(parentCtx context.Context, id int) (bool, error) {
 }
 
 func (x *Client) Workers(parentCtx context.Context) ([]*Worker, error) {
- ctx, cancel := context.WithTimeout(parentCtx, time.Second*5)
+ ctx, cancel := context.WithTimeout(parentCtx, time.Second*10)
  defer cancel()
 
  req, err := http.NewRequestWithContext(ctx, http.MethodGet, "https://api.browserstack.com/5/workers", nil)