Skip to content

[text analytics] remove await_prepared_test from async tests #10548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iscai-msft merged 1 commit into from
Mar 27, 2020
Merged

[text analytics] remove await_prepared_test from async tests #10548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions sdk/textanalytics/azure-ai-textanalytics/tests/asynctestcase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,6 @@ async def get_token(self, *args):


class AsyncTextAnalyticsTest(TextAnalyticsTest):
@staticmethod
def await_prepared_test(test_fn):
"""Synchronous wrapper for async test methods. Used to avoid making changes
upstream to AbstractPreparer (which doesn't await the functions it wraps)
"""

@functools.wraps(test_fn)
def run(test_class_instance, *args, **kwargs):
trim_kwargs_from_test_function(test_fn, kwargs)
loop = asyncio.get_event_loop()
return loop.run_until_complete(test_fn(test_class_instance, **kwargs))

return run

def generate_oauth_token(self):
if self.is_live:
Expand Down
32 changes: 0 additions & 32 deletions sdk/textanalytics/azure-ai-textanalytics/tests/test_analyze_sentiment_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,12 @@ async def send(self, request, **config):
class TestAnalyzeSentiment(AsyncTextAnalyticsTest):

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_no_single_input(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))
with self.assertRaises(TypeError):
response = await text_analytics.analyze_sentiment("hello world")

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_all_successful_passing_dict(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))

Expand All @@ -62,7 +60,6 @@ async def test_all_successful_passing_dict(self, resource_group, location, text_
self.assertIsNotNone(doc.sentences)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_all_successful_passing_text_document_input(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))

Expand All @@ -82,7 +79,6 @@ async def test_all_successful_passing_text_document_input(self, resource_group,
self.assertIsNotNone(doc.sentences)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_passing_only_string(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))

Expand All @@ -100,7 +96,6 @@ async def test_passing_only_string(self, resource_group, location, text_analytic
self.assertTrue(response[3].is_error)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_input_with_some_errors(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))

Expand All @@ -114,7 +109,6 @@ async def test_input_with_some_errors(self, resource_group, location, text_analy
self.assertFalse(response[2].is_error)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_input_with_all_errors(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))

Expand All @@ -128,7 +122,6 @@ async def test_input_with_all_errors(self, resource_group, location, text_analyt
self.assertTrue(response[2].is_error)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_empty_credential_class(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(""))
with self.assertRaises(ClientAuthenticationError):
Expand All @@ -137,7 +130,6 @@ async def test_empty_credential_class(self, resource_group, location, text_analy
)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_bad_credentials(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential("xxxxxxxxxxxx"))
with self.assertRaises(ClientAuthenticationError):
Expand All @@ -146,7 +138,6 @@ async def test_bad_credentials(self, resource_group, location, text_analytics_ac
)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_bad_model_version(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))
with self.assertRaises(HttpResponseError):
Expand All @@ -156,7 +147,6 @@ async def test_bad_model_version(self, resource_group, location, text_analytics_
)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_bad_document_input(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))

Expand All @@ -166,7 +156,6 @@ async def test_bad_document_input(self, resource_group, location, text_analytics
response = await text_analytics.analyze_sentiment(docs)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_mixing_inputs(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))
docs = [
Expand All @@ -178,7 +167,6 @@ async def test_mixing_inputs(self, resource_group, location, text_analytics_acco
response = await text_analytics.analyze_sentiment(docs)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_out_of_order_ids(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))

Expand All @@ -194,7 +182,6 @@ async def test_out_of_order_ids(self, resource_group, location, text_analytics_a
self.assertEqual(resp.id, in_order[idx])

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_show_stats_and_model_version(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))

Expand All @@ -220,7 +207,6 @@ def callback(response):
)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_batch_size_over_limit(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))

Expand All @@ -229,7 +215,6 @@ async def test_batch_size_over_limit(self, resource_group, location, text_analyt
response = await text_analytics.analyze_sentiment(docs)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_whole_batch_language_hint(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))

Expand All @@ -247,7 +232,6 @@ def callback(resp):
response = await text_analytics.analyze_sentiment(docs, language="fr", raw_response_hook=callback)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_whole_batch_dont_use_language_hint(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))

Expand All @@ -265,7 +249,6 @@ def callback(resp):
response = await text_analytics.analyze_sentiment(docs, language="", raw_response_hook=callback)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_per_item_dont_use_language_hint(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))

Expand All @@ -285,7 +268,6 @@ def callback(resp):
response = await text_analytics.analyze_sentiment(docs, raw_response_hook=callback)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_whole_batch_language_hint_and_obj_input(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))

Expand All @@ -303,7 +285,6 @@ def callback(resp):
response = await text_analytics.analyze_sentiment(docs, language="de", raw_response_hook=callback)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_whole_batch_language_hint_and_dict_input(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))

Expand All @@ -319,7 +300,6 @@ def callback(resp):
response = await text_analytics.analyze_sentiment(docs, language="es", raw_response_hook=callback)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_whole_batch_language_hint_and_obj_per_item_hints(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))

Expand All @@ -340,7 +320,6 @@ def callback(resp):
response = await text_analytics.analyze_sentiment(docs, language="en", raw_response_hook=callback)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_whole_batch_language_hint_and_dict_per_item_hints(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))

Expand All @@ -360,7 +339,6 @@ def callback(resp):
response = await text_analytics.analyze_sentiment(docs, language="en", raw_response_hook=callback)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_client_passed_default_language_hint(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key), default_language="es")

Expand All @@ -383,7 +361,6 @@ def callback_2(resp):
response = await text_analytics.analyze_sentiment(docs, raw_response_hook=callback)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_rotate_subscription_key(self, resource_group, location, text_analytics_account, text_analytics_account_key):
credential = TextAnalyticsApiKeyCredential(text_analytics_account_key)
text_analytics = TextAnalyticsClient(text_analytics_account, credential)
Expand All @@ -404,7 +381,6 @@ async def test_rotate_subscription_key(self, resource_group, location, text_anal
self.assertIsNotNone(response)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_user_agent(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))

Expand All @@ -421,7 +397,6 @@ def callback(resp):
response = await text_analytics.analyze_sentiment(docs, raw_response_hook=callback)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_document_attribute_error_no_result_attribute(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))

Expand All @@ -445,7 +420,6 @@ async def test_document_attribute_error_no_result_attribute(self, resource_group
)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_document_attribute_error_nonexistent_attribute(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))

Expand All @@ -462,7 +436,6 @@ async def test_document_attribute_error_nonexistent_attribute(self, resource_gro
)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_bad_model_version_error(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))

Expand All @@ -475,7 +448,6 @@ async def test_bad_model_version_error(self, resource_group, location, text_anal
self.assertIsNotNone(err.error.message)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_document_errors(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))
text = ""
Expand All @@ -495,7 +467,6 @@ async def test_document_errors(self, resource_group, location, text_analytics_ac
self.assertIsNotNone(doc_errors[2].error.message)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_missing_input_records_error(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))\

Expand All @@ -507,7 +478,6 @@ async def test_missing_input_records_error(self, resource_group, location, text_
self.assertIsNotNone(err.error.message)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_duplicate_ids_error(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))
# Duplicate Ids
Expand All @@ -520,7 +490,6 @@ async def test_duplicate_ids_error(self, resource_group, location, text_analytic
self.assertIsNotNone(err.error.message)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_batch_size_over_limit_error(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))

Expand All @@ -533,7 +502,6 @@ async def test_batch_size_over_limit_error(self, resource_group, location, text_
self.assertIsNotNone(err.error.message)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_language_kwarg_spanish(self, resource_group, location, text_analytics_account, text_analytics_account_key):
text_analytics = TextAnalyticsClient(text_analytics_account, TextAnalyticsApiKeyCredential(text_analytics_account_key))

Expand Down
2 changes: 0 additions & 2 deletions sdk/textanalytics/azure-ai-textanalytics/tests/test_auth_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ async def send(self, request, **config):

class TestAuth(AsyncTextAnalyticsTest):
@pytest.mark.live_test_only
@AsyncTextAnalyticsTest.await_prepared_test
async def test_active_directory_auth(self):
token = self.generate_oauth_token()
endpoint = self.get_oauth_endpoint()
Expand All @@ -40,7 +39,6 @@ async def test_active_directory_auth(self):
response = await text_analytics.detect_language(docs)

@GlobalTextAnalyticsAccountPreparer()
@AsyncTextAnalyticsTest.await_prepared_test
async def test_empty_credentials(self, resource_group, location, text_analytics_account, text_analytics_account_key):
with self.assertRaises(TypeError):
text_analytics = TextAnalyticsClient(text_analytics_account, "")
Expand Down
Loading