diff options
author | James Saryerwinnie <js@jamesls.com> | 2015-12-22 14:20:09 -0800 |
---|---|---|
committer | James Saryerwinnie <js@jamesls.com> | 2015-12-22 16:01:37 -0800 |
commit | ff5f116479f7c7fe42eb748fa62f1fcf1205cb22 (patch) | |
tree | 78f34cced1997d1ae32cac56fd799f4019bda82d | |
parent | 9f7a03e47607a16545a09ae98d0f6bf20fba0c67 (diff) | |
download | boto-ff5f116479f7c7fe42eb748fa62f1fcf1205cb22.tar.gz |
Remove py3 test whitelist
Verified everything passes via
"python test/tests.py default" on python3.
-rwxr-xr-x | tests/test.py | 53 | ||||
-rw-r--r-- | tests/unit/cloudsearchdomain/test_cloudsearchdomain.py | 3 |
2 files changed, 3 insertions, 53 deletions
diff --git a/tests/test.py b/tests/test.py index c20f35d7..9f5c6334 100755 --- a/tests/test.py +++ b/tests/test.py @@ -28,52 +28,7 @@ import sys from nose.core import run -# This is a whitelist of unit tests that support Python 3. -# When porting a new module to Python 3, please update this -# list so that its tests will run by default. See the -# `default` target below for more information. -# We use this instead of test attributes/tags because in -# order to filter on tags nose must load each test - many -# will fail to import with Python 3. -PY3_WHITELIST = ( - 'tests/unit/auth', - 'tests/unit/beanstalk', - 'tests/unit/cloudformation', - 'tests/unit/cloudfront', - 'tests/unit/cloudsearch', - 'tests/unit/cloudsearch2', - 'tests/unit/cloudtrail', - 'tests/unit/directconnect', - 'tests/unit/dynamodb', - 'tests/unit/dynamodb2', - 'tests/unit/ecs', - 'tests/unit/elasticache', - 'tests/unit/emr', - 'tests/unit/glacier', - 'tests/unit/iam', - 'tests/unit/ec2', - 'tests/unit/kms', - 'tests/unit/logs', - 'tests/unit/manage', - 'tests/unit/mws', - 'tests/unit/provider', - 'tests/unit/rds2', - 'tests/unit/route53', - 'tests/unit/s3', - 'tests/unit/sns', - 'tests/unit/ses', - 'tests/unit/sqs', - 'tests/unit/sts', - 'tests/unit/swf', - 'tests/unit/utils', - 'tests/unit/vpc', - 'tests/unit/test_connection.py', - 'tests/unit/test_exception.py', - 'tests/unit/test_regioninfo.py', -) - - -def main(whitelist=[]): +def main(): description = ("Runs boto unit and/or integration tests. " "Arguments will be passed on to nosetests. " "See nosetests --help for more information.") @@ -99,11 +54,7 @@ def main(whitelist=[]): for i, arg in enumerate(remaining_args): if arg == 'default': - if sys.version_info[0] == 3: - del remaining_args[i] - remaining_args += PY3_WHITELIST - else: - remaining_args[i] = 'tests/unit' + remaining_args[i] = 'tests/unit' all_args = [__file__] + attribute_args + remaining_args print("nose command:", ' '.join(all_args)) diff --git a/tests/unit/cloudsearchdomain/test_cloudsearchdomain.py b/tests/unit/cloudsearchdomain/test_cloudsearchdomain.py index 173341cb..e0758a47 100644 --- a/tests/unit/cloudsearchdomain/test_cloudsearchdomain.py +++ b/tests/unit/cloudsearchdomain/test_cloudsearchdomain.py @@ -95,8 +95,7 @@ class CloudSearchDomainConnectionTest(AWSMockServiceTestCase): layer1 = CloudSearchConnection(aws_access_key_id='aws_access_key_id', aws_secret_access_key='aws_secret_access_key', sign_request=True) - domain = Domain(layer1=layer1, - data=json.loads(self.domain_status)) + domain = Domain(layer1=layer1, data=json.loads(self.domain_status)) document_service = domain.get_document_service() response = { |