Update botocore tests. (#1051)

* Update moto decorators in tests.

* Remove py27 botocore dependencies.

* Drop testing for Python 3.7

Author: umaannamalai

tests/external_botocore/test_boto3_iam.py

@@ -16,7 +16,7 @@
 import uuid
 
 import boto3
-import moto
+from moto import mock_aws
 from testing_support.fixtures import dt_enabled
 from testing_support.validators.validate_span_events import validate_span_events
 from testing_support.validators.validate_transaction_metrics import (
@@ -27,8 +27,9 @@
 )
 
 from newrelic.api.background_task import background_task
+from newrelic.common.package_version_utils import get_package_version_tuple
 
-MOTO_VERSION = tuple(int(v) for v in moto.__version__.split(".")[:3])
+MOTO_VERSION = get_package_version_tuple("moto")
 
 AWS_ACCESS_KEY_ID = "AAAAAAAAAAAACCESSKEY"
 AWS_SECRET_ACCESS_KEY = "AAAAAASECRETKEY"  # nosec (This is fine for testing purposes)
@@ -61,7 +62,7 @@
     background_task=True,
 )
 @background_task()
-@moto.mock_iam
+@mock_aws
 def test_iam():
     iam = boto3.client(
         "iam",

tests/external_botocore/test_boto3_s3.py

@@ -17,17 +17,17 @@
 
 import boto3
 import botocore
-import moto
+from moto import mock_aws
 from testing_support.fixtures import dt_enabled
 from testing_support.validators.validate_span_events import validate_span_events
 from testing_support.validators.validate_transaction_metrics import (
     validate_transaction_metrics,
 )
 
 from newrelic.api.background_task import background_task
+from newrelic.common.package_version_utils import get_package_version_tuple
 
-MOTO_VERSION = tuple(int(v) for v in moto.__version__.split(".")[:3])
-
+MOTO_VERSION = get_package_version_tuple("moto")
 AWS_ACCESS_KEY_ID = "AAAAAAAAAAAACCESSKEY"
 AWS_SECRET_ACCESS_KEY = "AAAAAASECRETKEY"  # nosec
 AWS_REGION_NAME = "us-west-2"
@@ -80,7 +80,7 @@
     "test_boto3_s3:test_s3", scoped_metrics=_s3_scoped_metrics, rollup_metrics=_s3_rollup_metrics, background_task=True
 )
 @background_task()
-@moto.mock_s3
+@mock_aws
 def test_s3():
     client = boto3.client(
         "s3",

tests/external_botocore/test_boto3_sns.py

@@ -15,8 +15,8 @@
 import sys
 
 import boto3
-import moto
 import pytest
+from moto import mock_aws
 from testing_support.fixtures import dt_enabled
 from testing_support.validators.validate_span_events import validate_span_events
 from testing_support.validators.validate_transaction_metrics import (
@@ -27,9 +27,9 @@
 )
 
 from newrelic.api.background_task import background_task
+from newrelic.common.package_version_utils import get_package_version_tuple
 
-MOTO_VERSION = tuple(int(v) for v in moto.__version__.split(".")[:3])
-
+MOTO_VERSION = get_package_version_tuple("moto")
 AWS_ACCESS_KEY_ID = "AAAAAAAAAAAACCESSKEY"
 AWS_SECRET_ACCESS_KEY = "AAAAAASECRETKEY"  # nosec (This is fine for testing purposes)
 AWS_REGION_NAME = "us-east-1"
@@ -52,7 +52,7 @@
     background_task=True,
 )
 @background_task()
-@moto.mock_sns
+@mock_aws
 def test_publish_to_sns_topic(topic_argument):
     conn = boto3.client(
         "sns",
@@ -81,7 +81,7 @@ def test_publish_to_sns_topic(topic_argument):
     background_task=True,
 )
 @background_task()
-@moto.mock_sns
+@mock_aws
 def test_publish_to_sns_phone():
     conn = boto3.client(
         "sns",

tests/external_botocore/test_botocore_dynamodb.py

@@ -16,7 +16,7 @@
 import uuid
 
 import botocore.session
-import moto
+from moto import mock_aws
 from testing_support.fixtures import dt_enabled
 from testing_support.validators.validate_span_events import validate_span_events
 from testing_support.validators.validate_transaction_metrics import (
@@ -27,9 +27,9 @@
 )
 
 from newrelic.api.background_task import background_task
+from newrelic.common.package_version_utils import get_package_version_tuple
 
-MOTO_VERSION = tuple(int(v) for v in moto.__version__.split(".")[:3])
-
+MOTO_VERSION = get_package_version_tuple("moto")
 AWS_ACCESS_KEY_ID = "AAAAAAAAAAAACCESSKEY"
 AWS_SECRET_ACCESS_KEY = "AAAAAASECRETKEY"  # nosec (This is fine for testing purposes)
 AWS_REGION = "us-east-1"
@@ -73,7 +73,7 @@
     background_task=True,
 )
 @background_task()
-@moto.mock_dynamodb
+@mock_aws
 def test_dynamodb():
     session = botocore.session.get_session()
     client = session.create_client(

tests/external_botocore/test_botocore_ec2.py

@@ -16,7 +16,7 @@
 import uuid
 
 import botocore.session
-import moto
+from moto import mock_aws
 from testing_support.fixtures import dt_enabled
 from testing_support.validators.validate_span_events import validate_span_events
 from testing_support.validators.validate_transaction_metrics import (
@@ -27,9 +27,9 @@
 )
 
 from newrelic.api.background_task import background_task
+from newrelic.common.package_version_utils import get_package_version_tuple
 
-MOTO_VERSION = tuple(int(v) for v in moto.__version__.split(".")[:3])
-
+MOTO_VERSION = get_package_version_tuple("moto")
 AWS_ACCESS_KEY_ID = "AAAAAAAAAAAACCESSKEY"
 AWS_SECRET_ACCESS_KEY = "AAAAAASECRETKEY"  # nosec (This is fine for testing purposes)
 AWS_REGION = "us-east-1"
@@ -62,7 +62,7 @@
     background_task=True,
 )
 @background_task()
-@moto.mock_ec2
+@mock_aws
 def test_ec2():
     session = botocore.session.get_session()
     client = session.create_client(

tests/external_botocore/test_botocore_s3.py

@@ -17,16 +17,17 @@
 
 import botocore
 import botocore.session
-import moto
+from moto import mock_aws
 from testing_support.fixtures import dt_enabled
 from testing_support.validators.validate_span_events import validate_span_events
 from testing_support.validators.validate_transaction_metrics import (
     validate_transaction_metrics,
 )
 
 from newrelic.api.background_task import background_task
+from newrelic.common.package_version_utils import get_package_version_tuple
 
-MOTO_VERSION = tuple(int(v) for v in moto.__version__.split(".")[:3])
+MOTO_VERSION = get_package_version_tuple("moto")
 BOTOCORE_VERSION = tuple(int(v) for v in botocore.__version__.split(".")[:3])
 
 AWS_ACCESS_KEY_ID = "AAAAAAAAAAAACCESSKEY"
@@ -76,7 +77,7 @@
     background_task=True,
 )
 @background_task()
-@moto.mock_s3
+@mock_aws
 def test_s3():
     session = botocore.session.get_session()
     client = session.create_client(

tests/external_botocore/test_botocore_sqs.py

@@ -16,18 +16,18 @@
 import uuid
 
 import botocore.session
-import moto
 import pytest
+from moto import mock_aws
 from testing_support.fixtures import dt_enabled
 from testing_support.validators.validate_span_events import validate_span_events
 from testing_support.validators.validate_transaction_metrics import (
     validate_transaction_metrics,
 )
 
 from newrelic.api.background_task import background_task
-from newrelic.common.package_version_utils import get_package_version
+from newrelic.common.package_version_utils import get_package_version, get_package_version_tuple
 
-MOTO_VERSION = tuple(int(v) for v in moto.__version__.split(".")[:3])
+MOTO_VERSION = get_package_version_tuple("moto")
 
 url = "sqs.us-east-1.amazonaws.com"
 botocore_version = tuple([int(n) for n in get_package_version("botocore").split(".")])
@@ -78,7 +78,7 @@
     background_task=True,
 )
 @background_task()
-@moto.mock_sqs
+@mock_aws
 def test_sqs():
     session = botocore.session.get_session()
     client = session.create_client(
@@ -126,7 +126,7 @@ def test_sqs():
     background_task=True,
 )
 @background_task()
-@moto.mock_sqs
+@mock_aws
 def test_sqs_malformed():
     session = botocore.session.get_session()
     client = session.create_client(

tox.ini

@@ -75,30 +75,9 @@ envlist =
     python-coroutines_asyncio-{py37,py38,py39,py310,py311,pypy38},
     python-cross_agent-{py27,py37,py38,py39,py310,py311}-{with,without}_extensions,
     python-cross_agent-pypy27-without_extensions,
-    postgres-datastore_asyncpg-{py37,py38,py39,py310,py311},
-    memcached-datastore_bmemcached-{pypy27,py27,py37,py38,py39,py310,py311}-memcached030,
-    elasticsearchserver07-datastore_elasticsearch-{py27,py37,py38,py39,py310,py311,pypy27,pypy38}-elasticsearch07,
-    elasticsearchserver08-datastore_elasticsearch-{py37,py38,py39,py310,py311,pypy38}-elasticsearch08,
-    memcached-datastore_memcache-{py37,py38,py39,py310,py311,pypy38}-memcached01,
-    mysql-datastore_mysql-mysql080023-py27,
-    mysql-datastore_mysql-mysqllatest-{py37,py38,py39,py310,py311},
-    firestore-datastore_firestore-{py37,py38,py39,py310,py311},
-    postgres-datastore_postgresql-{py37,py38,py39},
-    postgres-datastore_psycopg2-{py27,py37,py38,py39,py310,py311}-psycopg2latest
-    postgres-datastore_psycopg2cffi-{py27,pypy27,py37,py38,py39,py310,py311}-psycopg2cffilatest,
-    postgres-datastore_pyodbc-{py27,py37,py311}-pyodbclatest
-    memcached-datastore_pylibmc-{py27,py37},
-    memcached-datastore_pymemcache-{py27,py37,py38,py39,py310,py311,pypy27,pypy38},
-    mongodb-datastore_pymongo-{py27,py37,py38,py39,py310,py311,pypy27}-pymongo{03},
-    mongodb-datastore_pymongo-{py37,py38,py39,py310,py311,pypy27,pypy38}-pymongo04,
-    mssql-datastore_pymssql-{py37,py38,py39,py310,py311},
-    mysql-datastore_pymysql-{py27,py37,py38,py39,py310,py311,pypy27,pypy38},
-    solr-datastore_pysolr-{py27,py37,py38,py39,py310,py311,pypy27,pypy38},
-    redis-datastore_redis-{py37,py38,py39,py310,py311,pypy38}-redis{0400,latest},
-    rediscluster-datastore_rediscluster-{py37,py311,pypy38}-redis{latest},
-    python-datastore_sqlite-{py27,py37,py38,py39,py310,py311,pypy27,pypy38},
-    python-external_botocore-{py37,py38,py39,py310,py311}-botocorelatest,
-    python-external_botocore-{py311}-botocore128,
+    python-datastore_sqlite-{py27,py37,py38,py39,py310,py311,py312,pypy27,pypy38},
+    python-external_botocore-py311-botocore128,
+    python-external_botocore-{py38,py39,py310,py311,py312}-botocorelatest,
     python-external_botocore-py310-botocore0125,
     python-external_feedparser-py27-feedparser{05,06},
     python-external_http-{py27,py37,py38,py39,py310,py311,pypy27},
@@ -256,9 +235,7 @@ deps =
     external_botocore-botocorelatest: boto3
     external_botocore-botocore128: botocore<1.29
     external_botocore-botocore0125: botocore<1.26
-    external_botocore-{py37,py38,py39,py310,py311}: moto[awslambda,ec2,iam,sqs]
-    external_botocore-py27: rsa<4.7.1
-    external_botocore-py27: moto[awslambda,ec2,iam,sqs]<2.0
+    external_botocore-{py38,py39,py310,py311,py312}: moto
     external_feedparser-feedparser05: feedparser<6
     external_feedparser-feedparser06: feedparser<7
     external_httplib2: httplib2<1.0