Merge remote-tracking branch 'upstream/main' into enable-cloudwatch-canary

jsitu777 · jsitu777 · commit e635f617b57c · 2023-03-31T13:45:50.000-07:00
diff --git a/test/canary/scripts/run_test.sh b/test/canary/scripts/run_test.sh
@@ -98,6 +98,6 @@ pushd $E2E_DIR
     pytest_args+=(-m "canary or select_regions_1")
   else
     pytest_args+=(-m "canary")
-  pytest "${pytest_args[@]}"
   fi
+  pytest "${pytest_args[@]}"
 popd
diff --git a/test/e2e/__init__.py b/test/e2e/__init__.py
@@ -49,7 +49,7 @@ def create_sagemaker_resource(
     spec_file,
     replacements,
     namespace="default",
-    wait_period=3,
+    wait_period=6,
     period_length=10,
 ):
     """
diff --git a/test/e2e/conftest.py b/test/e2e/conftest.py
@@ -29,6 +29,7 @@ def pytest_configure(config):
         "markers", "service(arg): mark test associated with a given service"
     )
     config.addinivalue_line("markers", "slow: mark test as slow to run")
+    config.addinivalue_line("markers", "select_regions_1: mark test to only run if in select region")
 
 
 def pytest_collection_modifyitems(config, items):

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ def pytest_configure(config):`
`29`	`29`	`"markers", "service(arg): mark test associated with a given service"`
`30`	`30`	`)`
`31`	`31`	`config.addinivalue_line("markers", "slow: mark test as slow to run")`
	`32`	`+ config.addinivalue_line("markers", "select_regions_1: mark test to only run if in select region")`
`32`	`33`
`33`	`34`
`34`	`35`	`def pytest_collection_modifyitems(config, items):`