From 48c64f2d460d5709662e73941dd1e77d7a46fa46 Mon Sep 17 00:00:00 2001 From: Victoria Hall Date: Wed, 28 Aug 2024 10:47:00 -0500 Subject: [PATCH 1/3] removed skipping for docker tests --- tests/endtoend/test_eventhub_batch_functions.py | 10 ---------- tests/endtoend/test_generic_functions.py | 9 --------- tests/endtoend/test_servicebus_functions.py | 3 --- tests/endtoend/test_table_functions.py | 12 ------------ .../endtoend/test_worker_process_count_functions.py | 2 +- 5 files changed, 1 insertion(+), 35 deletions(-) diff --git a/tests/endtoend/test_eventhub_batch_functions.py b/tests/endtoend/test_eventhub_batch_functions.py index 5785de39..c2aecef4 100644 --- a/tests/endtoend/test_eventhub_batch_functions.py +++ b/tests/endtoend/test_eventhub_batch_functions.py @@ -12,11 +12,6 @@ from azure_functions_worker.utils.common import is_envvar_true -@skipIf(is_envvar_true(DEDICATED_DOCKER_TEST) - or is_envvar_true(CONSUMPTION_DOCKER_TEST), - "Table functions which are used in the bindings in these tests" - " has a bug with the table extension 1.0.0. " - "https://github.com/Azure/azure-sdk-for-net/issues/33902.") class TestEventHubFunctions(testutils.WebHostTestCase): """Test EventHub Trigger and Output Bindings (cardinality: many). @@ -135,11 +130,6 @@ def test_eventhub_multiple_with_metadata(self): self.assertIsNotNone(sys_props['Offset']) -@skipIf(is_envvar_true(DEDICATED_DOCKER_TEST) - or is_envvar_true(CONSUMPTION_DOCKER_TEST), - "Table functions which are used in the bindings has a bug with the" - " table extension 1.0.0. " - "https://github.com/Azure/azure-sdk-for-net/issues/33902.") class TestEventHubBatchFunctionsStein(testutils.WebHostTestCase): @classmethod diff --git a/tests/endtoend/test_generic_functions.py b/tests/endtoend/test_generic_functions.py index 46f83937..7b1fe7e3 100644 --- a/tests/endtoend/test_generic_functions.py +++ b/tests/endtoend/test_generic_functions.py @@ -10,11 +10,6 @@ from azure_functions_worker.utils.common import is_envvar_true -@skipIf(is_envvar_true(DEDICATED_DOCKER_TEST) - or is_envvar_true(CONSUMPTION_DOCKER_TEST), - "Table functions which are used in the bindings in these tests" - " has a bug with the table extension 1.0.0. " - "https://github.com/Azure/azure-sdk-for-net/issues/33902.") class TestGenericFunctions(testutils.WebHostTestCase): """Test Generic Functions with implicit output enabled @@ -73,10 +68,6 @@ def check_log_return_types(self, host_out: typing.List[str]): self.assertFalse(errors_found) -@skipIf(is_envvar_true(DEDICATED_DOCKER_TEST) - or is_envvar_true(CONSUMPTION_DOCKER_TEST), - "Table functions has a bug with the table extension 1.0.0." - "https://github.com/Azure/azure-sdk-for-net/issues/33902.") class TestGenericFunctionsStein(TestGenericFunctions): @classmethod diff --git a/tests/endtoend/test_servicebus_functions.py b/tests/endtoend/test_servicebus_functions.py index c8b69157..26c3ade5 100644 --- a/tests/endtoend/test_servicebus_functions.py +++ b/tests/endtoend/test_servicebus_functions.py @@ -10,9 +10,6 @@ from azure_functions_worker.utils.common import is_envvar_true -@skipIf(is_envvar_true(DEDICATED_DOCKER_TEST) - or is_envvar_true(CONSUMPTION_DOCKER_TEST), - "Skipping SB tests till docker image is updated with host 4.33") class TestServiceBusFunctions(testutils.WebHostTestCase): @classmethod diff --git a/tests/endtoend/test_table_functions.py b/tests/endtoend/test_table_functions.py index c53d6e8d..71b25092 100644 --- a/tests/endtoend/test_table_functions.py +++ b/tests/endtoend/test_table_functions.py @@ -11,10 +11,6 @@ from azure_functions_worker.utils.common import is_envvar_true -@skipIf(is_envvar_true(DEDICATED_DOCKER_TEST) - or is_envvar_true(CONSUMPTION_DOCKER_TEST), - "Table functions has a bug with the table extension 1.0.0." - "https://github.com/Azure/azure-sdk-for-net/issues/33902.") class TestTableFunctions(testutils.WebHostTestCase): @classmethod @@ -50,10 +46,6 @@ def test_table_bindings(self): self.assertTrue(row_key_present) -@skipIf(is_envvar_true(DEDICATED_DOCKER_TEST) - or is_envvar_true(CONSUMPTION_DOCKER_TEST), - "Table functions has a bug with the table extension 1.0.0." - "https://github.com/Azure/azure-sdk-for-net/issues/33902.") class TestTableFunctionsStein(testutils.WebHostTestCase): @classmethod @@ -76,10 +68,6 @@ def test_table_bindings(self): self.assertTrue(row_key_present) -@skipIf(is_envvar_true(DEDICATED_DOCKER_TEST) - or is_envvar_true(CONSUMPTION_DOCKER_TEST), - "Table functions has a bug with the table extension 1.0.0." - "https://github.com/Azure/azure-sdk-for-net/issues/33902.") class TestTableFunctionsGeneric(TestTableFunctionsStein): @classmethod diff --git a/tests/endtoend/test_worker_process_count_functions.py b/tests/endtoend/test_worker_process_count_functions.py index 8ee6577b..4b36d988 100644 --- a/tests/endtoend/test_worker_process_count_functions.py +++ b/tests/endtoend/test_worker_process_count_functions.py @@ -38,7 +38,7 @@ def get_script_dir(cls): def get_environment_variables(cls): return cls.env_variables - @testutils.retryable_test(4, 5) + @testutils.retryable_test(5, 5) def test_http_func_with_worker_process_count_2(self): response = [None, None] From 1211ffc1905b5f8ed1a96ee9541b1ab615aa9f6c Mon Sep 17 00:00:00 2001 From: Victoria Hall Date: Fri, 30 Aug 2024 12:48:48 -0500 Subject: [PATCH 2/3] lint --- tests/endtoend/test_eventhub_batch_functions.py | 4 ---- tests/endtoend/test_generic_functions.py | 4 ---- tests/endtoend/test_servicebus_functions.py | 4 ---- tests/endtoend/test_table_functions.py | 4 ---- 4 files changed, 16 deletions(-) diff --git a/tests/endtoend/test_eventhub_batch_functions.py b/tests/endtoend/test_eventhub_batch_functions.py index c2aecef4..11cf4d38 100644 --- a/tests/endtoend/test_eventhub_batch_functions.py +++ b/tests/endtoend/test_eventhub_batch_functions.py @@ -3,13 +3,9 @@ import json import time from datetime import datetime -from unittest import skipIf from dateutil import parser from tests.utils import testutils -from tests.utils.constants import CONSUMPTION_DOCKER_TEST, DEDICATED_DOCKER_TEST - -from azure_functions_worker.utils.common import is_envvar_true class TestEventHubFunctions(testutils.WebHostTestCase): diff --git a/tests/endtoend/test_generic_functions.py b/tests/endtoend/test_generic_functions.py index 7b1fe7e3..361b67f7 100644 --- a/tests/endtoend/test_generic_functions.py +++ b/tests/endtoend/test_generic_functions.py @@ -2,12 +2,8 @@ # Licensed under the MIT License. import time import typing -from unittest import skipIf from tests.utils import testutils -from tests.utils.constants import CONSUMPTION_DOCKER_TEST, DEDICATED_DOCKER_TEST - -from azure_functions_worker.utils.common import is_envvar_true class TestGenericFunctions(testutils.WebHostTestCase): diff --git a/tests/endtoend/test_servicebus_functions.py b/tests/endtoend/test_servicebus_functions.py index 26c3ade5..aaacd76d 100644 --- a/tests/endtoend/test_servicebus_functions.py +++ b/tests/endtoend/test_servicebus_functions.py @@ -2,12 +2,8 @@ # Licensed under the MIT License. import json import time -from unittest import skipIf from tests.utils import testutils -from tests.utils.constants import CONSUMPTION_DOCKER_TEST, DEDICATED_DOCKER_TEST - -from azure_functions_worker.utils.common import is_envvar_true class TestServiceBusFunctions(testutils.WebHostTestCase): diff --git a/tests/endtoend/test_table_functions.py b/tests/endtoend/test_table_functions.py index 71b25092..d6e367bd 100644 --- a/tests/endtoend/test_table_functions.py +++ b/tests/endtoend/test_table_functions.py @@ -3,12 +3,8 @@ import json import pathlib import time -from unittest import skipIf from tests.utils import testutils -from tests.utils.constants import CONSUMPTION_DOCKER_TEST, DEDICATED_DOCKER_TEST - -from azure_functions_worker.utils.common import is_envvar_true class TestTableFunctions(testutils.WebHostTestCase): From 2f6fab97c17be26ee4b8e20b27e1f13dd261de79 Mon Sep 17 00:00:00 2001 From: Victoria Hall Date: Fri, 30 Aug 2024 15:17:27 -0500 Subject: [PATCH 3/3] revert extra fwpc retry --- tests/endtoend/test_worker_process_count_functions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/endtoend/test_worker_process_count_functions.py b/tests/endtoend/test_worker_process_count_functions.py index 4b36d988..8ee6577b 100644 --- a/tests/endtoend/test_worker_process_count_functions.py +++ b/tests/endtoend/test_worker_process_count_functions.py @@ -38,7 +38,7 @@ def get_script_dir(cls): def get_environment_variables(cls): return cls.env_variables - @testutils.retryable_test(5, 5) + @testutils.retryable_test(4, 5) def test_http_func_with_worker_process_count_2(self): response = [None, None]