Merge branch 'develop' into tmp/1693521370/main

xazhao · web-flow · commit 83e768567ae2 · 2023-08-31T15:47:03.000-07:00
diff --git a/integration/combination/test_connectors.py b/integration/combination/test_connectors.py
@@ -7,7 +7,7 @@
 
 from integration.config.service_names import SCHEDULE_EVENT
 from integration.conftest import clean_bucket
-from integration.helpers.base_test import S3_BUCKET_PREFIX, BaseTest
+from integration.helpers.base_test import S3_BUCKET_PREFIX, BaseTest, nonblocking
 from integration.helpers.resource import current_region_does_not_support, generate_suffix
 
 retry_once = retry(
@@ -24,6 +24,7 @@
     current_region_does_not_support([SCHEDULE_EVENT]),
     "SCHEDULE_EVENT is not supported in this testing region",
 )
+@nonblocking
 class TestConnectorsWithEventBus(BaseTest):
     @parameterized.expand(
         [

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`from integration.config.service_names import SCHEDULE_EVENT`
`9`	`9`	`from integration.conftest import clean_bucket`
`10`		`-from integration.helpers.base_test import S3_BUCKET_PREFIX, BaseTest`
	`10`	`+from integration.helpers.base_test import S3_BUCKET_PREFIX, BaseTest, nonblocking`
`11`	`11`	`from integration.helpers.resource import current_region_does_not_support, generate_suffix`
`12`	`12`
`13`	`13`	`retry_once = retry(`
`@@ -24,6 +24,7 @@`
`24`	`24`	`current_region_does_not_support([SCHEDULE_EVENT]),`
`25`	`25`	`"SCHEDULE_EVENT is not supported in this testing region",`
`26`	`26`	`)`
	`27`	`+@nonblocking`
`27`	`28`	`class TestConnectorsWithEventBus(BaseTest):`
`28`	`29`	`@parameterized.expand(`
`29`	`30`	`[`