From ce4eb4950a13cde0c0f397c998f40e9b39a71640 Mon Sep 17 00:00:00 2001 From: Oleg Bespalov Date: Wed, 18 Dec 2024 17:57:43 +0100 Subject: [PATCH 1/2] Explicitly check if we actually timed out --- js/modules/k6/browser/common/browser.go | 12 +++++++++++- js/modules/k6/browser/common/browser_context.go | 4 +--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/js/modules/k6/browser/common/browser.go b/js/modules/k6/browser/common/browser.go index 83108b67075..c0f167a2b95 100644 --- a/js/modules/k6/browser/common/browser.go +++ b/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 } diff --git a/js/modules/k6/browser/common/browser_context.go b/js/modules/k6/browser/common/browser_context.go index 6e0b842f969..2a93ade6e3b 100644 --- a/js/modules/k6/browser/common/browser_context.go +++ b/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 From ff08e56895378b374cceba53ed395d8abb874994 Mon Sep 17 00:00:00 2001 From: Oleg Bespalov Date: Fri, 20 Dec 2024 11:35:16 +0100 Subject: [PATCH 2/2] Reverted setting of targetID --- js/modules/k6/browser/common/browser_context.go | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/js/modules/k6/browser/common/browser_context.go b/js/modules/k6/browser/common/browser_context.go index 2a93ade6e3b..c051cb86951 100644 --- a/js/modules/k6/browser/common/browser_context.go +++ b/js/modules/k6/browser/common/browser_context.go @@ -262,16 +262,7 @@ func (b *BrowserContext) NewPage() (*Page, error) { return nil, err } - var ( - bctxid cdp.BrowserContextID - ptid target.ID - ) - if b != nil { - bctxid = b.id - } - - b.logger.Debugf("BrowserContext:NewPage:return", "bctxid:%v ptid:%s", bctxid, ptid) - + b.logger.Debugf("BrowserContext:NewPage:return", "bctxid:%v ptid:%s", b.id, p.targetID) return p, nil }