Explicitly check if we actually timed out

js/modules/k6/browser/common/browser.go

@@ -493,12 +493,22 @@ func (b *Browser) newPageInContext(id cdp.BrowserContextID) (*Page, error) {
 		page = b.pages[tid]
 		b.pagesMu.RUnlock()
 	case <-ctx.Done():
+		b.logger.Debugf("Browser:newPageInContext:<-ctx.Done", "tid:%v bctxid:%v err:%v", tid, id, ctx.Err())
+	}
+
+	if err = ctx.Err(); err != nil {
 		err = &k6ext.UserFriendlyError{
 			Err:     ctx.Err(),
 			Timeout: b.browserOpts.Timeout,
 		}
-		b.logger.Debugf("Browser:newPageInContext:<-ctx.Done", "tid:%v bctxid:%v err:%v", tid, id, err)
 	}
+
+	if err == nil && page == nil {
+		err = &k6ext.UserFriendlyError{
+			Err: errors.New("can't fetch the page for unknown reason"),
+		}
+	}
+
 	return page, err
 }
 

js/modules/k6/browser/common/browser_context.go

@@ -269,9 +269,7 @@ func (b *BrowserContext) NewPage() (*Page, error) {
 	if b != nil {
 		bctxid = b.id
 	}
-	if p != nil {
-		ptid = p.targetID
-	}
+
 	b.logger.Debugf("BrowserContext:NewPage:return", "bctxid:%v ptid:%s", bctxid, ptid)
 
 	return p, nil