From 837ad164918c433526ffb47dc58c8f552a9c4de9 Mon Sep 17 00:00:00 2001
From: Bjorn Lu <bjornlu.dev@gmail.com>
Date: Wed, 6 Sep 2023 03:35:41 +0800
Subject: [PATCH] Skip cloudflare CLI tests if fail to start (#8417)

* Skip cloudflare CLI tests if fail to start

* Fix port

---------

Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>
---
 packages/integrations/cloudflare/test/basics.test.js |  8 ++++++--
 packages/integrations/cloudflare/test/cf.test.js     | 12 ++++++++----
 .../integrations/cloudflare/test/runtime.test.js     |  8 ++++++--
 .../cloudflare/test/with-solid-js.test.js            |  8 ++++++--
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/packages/integrations/cloudflare/test/basics.test.js b/packages/integrations/cloudflare/test/basics.test.js
index c27b6be6ccdb..726a19fc61d8 100644
--- a/packages/integrations/cloudflare/test/basics.test.js
+++ b/packages/integrations/cloudflare/test/basics.test.js
@@ -8,14 +8,18 @@ describe('Basic app', () => {
 	/** @type {import('./test-utils').WranglerCLI} */
 	let cli;
 
-	before(async () => {
+	before(async function () {
 		fixture = await loadFixture({
 			root: './fixtures/basics/',
 		});
 		await fixture.build();
 
 		cli = await runCLI('./fixtures/basics/', { silent: true, port: 8789 });
-		await cli.ready;
+		await cli.ready.catch((e) => {
+			console.log(e);
+			// if fail to start, skip for now as it's very flaky
+			this.skip();
+		});
 	});
 
 	after(async () => {
diff --git a/packages/integrations/cloudflare/test/cf.test.js b/packages/integrations/cloudflare/test/cf.test.js
index ec0e52c97e4d..64c406d12f26 100644
--- a/packages/integrations/cloudflare/test/cf.test.js
+++ b/packages/integrations/cloudflare/test/cf.test.js
@@ -9,7 +9,7 @@ describe('Cf metadata and caches', () => {
 	/** @type {import('./test-utils').WranglerCLI} */
 	let cli;
 
-	before(async () => {
+	before(async function () {
 		fixture = await loadFixture({
 			root: './fixtures/cf/',
 			output: 'server',
@@ -17,8 +17,12 @@ describe('Cf metadata and caches', () => {
 		});
 		await fixture.build();
 
-		cli = await runCLI('./fixtures/cf/', { silent: false, port: 8788 });
-		await cli.ready;
+		cli = await runCLI('./fixtures/cf/', { silent: true, port: 8786 });
+		await cli.ready.catch((e) => {
+			console.log(e);
+			// if fail to start, skip for now as it's very flaky
+			this.skip();
+		});
 	});
 
 	after(async () => {
@@ -26,7 +30,7 @@ describe('Cf metadata and caches', () => {
 	});
 
 	it('Load cf and caches API', async () => {
-		let res = await fetch(`http://127.0.0.1:8788/`);
+		let res = await fetch(`http://127.0.0.1:8786/`);
 		expect(res.status).to.equal(200);
 		let html = await res.text();
 		let $ = cheerio.load(html);
diff --git a/packages/integrations/cloudflare/test/runtime.test.js b/packages/integrations/cloudflare/test/runtime.test.js
index be14718e8f4f..8bb38d7e59da 100644
--- a/packages/integrations/cloudflare/test/runtime.test.js
+++ b/packages/integrations/cloudflare/test/runtime.test.js
@@ -9,7 +9,7 @@ describe('Runtime Locals', () => {
 	/** @type {import('./test-utils.js').WranglerCLI} */
 	let cli;
 
-	before(async () => {
+	before(async function () {
 		fixture = await loadFixture({
 			root: './fixtures/runtime/',
 			output: 'server',
@@ -18,7 +18,11 @@ describe('Runtime Locals', () => {
 		await fixture.build();
 
 		cli = await runCLI('./fixtures/runtime/', { silent: true, port: 8793 });
-		await cli.ready;
+		await cli.ready.catch((e) => {
+			console.log(e);
+			// if fail to start, skip for now as it's very flaky
+			this.skip();
+		});
 	});
 
 	after(async () => {
diff --git a/packages/integrations/cloudflare/test/with-solid-js.test.js b/packages/integrations/cloudflare/test/with-solid-js.test.js
index c091d04b3dba..c644163b0da7 100644
--- a/packages/integrations/cloudflare/test/with-solid-js.test.js
+++ b/packages/integrations/cloudflare/test/with-solid-js.test.js
@@ -8,14 +8,18 @@ describe('With SolidJS', () => {
 	/** @type {import('./test-utils').WranglerCLI} */
 	let cli;
 
-	before(async () => {
+	before(async function () {
 		fixture = await loadFixture({
 			root: './fixtures/with-solid-js/',
 		});
 		await fixture.build();
 
 		cli = await runCLI('./fixtures/with-solid-js/', { silent: true, port: 8790 });
-		await cli.ready;
+		await cli.ready.catch((e) => {
+			console.log(e);
+			// if fail to start, skip for now as it's very flaky
+			this.skip();
+		});
 	});
 
 	after(async () => {