Stabilize browser tests in CI

Author: libi

browser/tab.go

@@ -210,18 +210,18 @@ func (b *Browser) TabClose(index int) error {
 
 	closeTID := pages[index].TargetID
 
-	closeErr := chromedp.Run(b.ctx, chromedp.ActionFunc(func(ctx context.Context) error {
-		return target.CloseTarget(closeTID).Do(ctx)
-	}))
-	if closeErr != nil {
-		return closeErr
-	}
-
-	// Remove any tracked context for the closed tab after the target is closed.
 	for i, entry := range b.tabs {
 		if entry.targetID == closeTID {
 			if entry.cancel != nil {
-				entry.cancel()
+				if err := chromedp.Cancel(entry.ctx); err != nil {
+					return err
+				}
+			} else {
+				if err := chromedp.Run(b.ctx, chromedp.ActionFunc(func(ctx context.Context) error {
+					return target.CloseTarget(closeTID).Do(ctx)
+				})); err != nil {
+					return err
+				}
 			}
 			b.tabs = append(b.tabs[:i], b.tabs[i+1:]...)
 			switch {
@@ -234,10 +234,16 @@ func (b *Browser) TabClose(index int) error {
 					b.activeTab = len(b.tabs) - 1
 				}
 			}
-			break
+			b.lastSnap = nil
+			return nil
 		}
 	}
 
+	if err := chromedp.Run(b.ctx, chromedp.ActionFunc(func(ctx context.Context) error {
+		return target.CloseTarget(closeTID).Do(ctx)
+	})); err != nil {
+		return err
+	}
 	b.lastSnap = nil
 	return nil
 }

tests/helpers_test.go

@@ -43,7 +43,11 @@ func newBrowser(t *testing.T) *browser.Browser {
 			Timeout:  30 * time.Second,
 		})
 		if err == nil {
-			break
+			_, err = b.GetURL()
+			if err == nil {
+				break
+			}
+			b.Close()
 		}
 		if i < attempts-1 && strings.Contains(err.Error(), "chrome failed to start") {
 			time.Sleep(750 * time.Millisecond)