pytest: add global configfile and autouse teardown fixtures

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/s3tests/functional/__init__.py b/s3tests/functional/__init__.py
index 8911e02b16e2671f31a516d28d4920fc802067fa..a3890d4b5a8fb9cc9670d085a485ed70234b6607 100644 (file)
--- a/s3tests/functional/__init__.py
+++ b/s3tests/functional/__init__.py
@@ -7,6 +7,7 @@ import itertools
 import os
 import random
 import string
+import pytest
 from http.client import HTTPConnection, HTTPSConnection
 from urllib.parse import urlparse
 
@@ -370,6 +371,15 @@ def teardown():
     # remove our buckets here also, to avoid littering
     nuke_prefixed_buckets(prefix=prefix)
 
+@pytest.fixture(scope="package")
+def configfile():
+    setup()
+    yield config
+
+@pytest.fixture(autouse=True)
+def setup_teardown(configfile):
+    yield
+    teardown()
 
 bucket_counter = itertools.count(1)
 

diff --git a/s3tests/functional/test_headers.py b/s3tests/functional/test_headers.py
index 63f0c5675b6df09df11790708ac856242657242a..f4415b7caf31a4916ca8c748ecc0f0f986d9dafb 100644 (file)
--- a/s3tests/functional/test_headers.py
+++ b/s3tests/functional/test_headers.py
@@ -27,6 +27,8 @@ from .utils import assert_raises
 from email.header import decode_header
 
 from . import (
+    configfile,
+    setup_teardown,
     _make_raw_request,
     nuke_prefixed_buckets,
     get_new_bucket,

diff --git a/s3tests/functional/test_s3.py b/s3tests/functional/test_s3.py
index 808f9fa3e86f0125508780965a5fd4109a6c49bf..db7dfb3cc7e19bc56bd159a5b829c84c145814c7 100644 (file)
--- a/s3tests/functional/test_s3.py
+++ b/s3tests/functional/test_s3.py
@@ -37,6 +37,8 @@ from .utils import assert_raises
 from .policy import Policy, Statement, make_json_policy
 
 from . import (
+    configfile,
+    setup_teardown,
     nuke_prefixed_buckets,
     get_new_bucket,
     get_new_bucket_name,

diff --git a/s3tests/functional/test_s3_website.py b/s3tests/functional/test_s3_website.py
index 3696004969b1216422eb7f8614093557eba26afd..bd8346899dafc059d3040146769aa9502bdedc1f 100644 (file)
--- a/s3tests/functional/test_s3_website.py
+++ b/s3tests/functional/test_s3_website.py
@@ -19,6 +19,8 @@ from nose.plugins.skip import SkipTest
 from .. import common
 
 from . import (
+    configfile,
+    setup_teardown,
     get_new_bucket,
     get_new_bucket_name,
     s3,

diff --git a/s3tests_boto3/functional/__init__.py b/s3tests_boto3/functional/__init__.py
index 4d03d6584a5e4b1af5c75f74e660fe8bab819135..22b136cc80c77d68dba4b271fd0e13b2cdacc7b0 100644 (file)
--- a/s3tests_boto3/functional/__init__.py
+++ b/s3tests_boto3/functional/__init__.py
@@ -1,3 +1,4 @@
+import pytest
 import boto3
 from botocore import UNSIGNED
 from botocore.client import Config
@@ -308,6 +309,16 @@ def teardown():
     except:
         pass
 
+@pytest.fixture(scope="package")
+def configfile():
+    setup()
+    return config
+
+@pytest.fixture(autouse=True)
+def setup_teardown(configfile):
+    yield
+    teardown()
+
 def check_webidentity():
     cfg = configparser.RawConfigParser()
     try:

diff --git a/s3tests_boto3/functional/test_headers.py b/s3tests_boto3/functional/test_headers.py
index 04b275744e407c34cd7ab27191c963328d5bf98b..a983c6e445cd45e3f2e70a19f5510dc45ac055c7 100644 (file)
--- a/s3tests_boto3/functional/test_headers.py
+++ b/s3tests_boto3/functional/test_headers.py
@@ -10,6 +10,8 @@ from .utils import _get_status_and_error_code
 from .utils import _get_status
 
 from . import (
+    configfile,
+    setup_teardown,
     get_client,
     get_v2_client,
     get_new_bucket,

diff --git a/s3tests_boto3/functional/test_iam.py b/s3tests_boto3/functional/test_iam.py
index bf7236fe9bc94c11ab9e6ddffbaa83fc68a80c7d..e402356b17c8a96112ccccd4915c02c9cceb4a59 100644 (file)
--- a/s3tests_boto3/functional/test_iam.py
+++ b/s3tests_boto3/functional/test_iam.py
@@ -7,6 +7,8 @@ from nose.tools import eq_ as eq
 from s3tests_boto3.functional.utils import assert_raises
 from s3tests_boto3.functional.test_s3 import _multipart_upload
 from . import (
+    configfile,
+    setup_teardown,
     get_alt_client,
     get_iam_client,
     get_new_bucket,

diff --git a/s3tests_boto3/functional/test_s3.py b/s3tests_boto3/functional/test_s3.py
index 20ae4f1d0ab2276db33b847fce9940ad2357770a..16018092458097556ce30f923438bca71e5c0e7a 100644 (file)
--- a/s3tests_boto3/functional/test_s3.py
+++ b/s3tests_boto3/functional/test_s3.py
@@ -41,6 +41,8 @@ from .utils import _get_status
 from .policy import Policy, Statement, make_json_policy
 
 from . import (
+    configfile,
+    setup_teardown,
     get_client,
     get_prefix,
     get_unauthenticated_client,

diff --git a/s3tests_boto3/functional/test_s3select.py b/s3tests_boto3/functional/test_s3select.py
index 85d7c3957d7aa27d7bafa9cdbf1652f2de320933..0b5ccda5fba8b8a857aa6c2d36fe0e24a3261e28 100644 (file)
--- a/s3tests_boto3/functional/test_s3select.py
+++ b/s3tests_boto3/functional/test_s3select.py
@@ -9,6 +9,8 @@ import uuid
 from nose.tools import eq_ as eq
 
 from . import (
+    configfile,
+    setup_teardown,
     get_client
     )
 

diff --git a/s3tests_boto3/functional/test_sts.py b/s3tests_boto3/functional/test_sts.py
index dce1712745e2ce089a92533a464550473710a117..16b967c2443c218989d105f31b26b6b7ba8e53e8 100644 (file)
--- a/s3tests_boto3/functional/test_sts.py
+++ b/s3tests_boto3/functional/test_sts.py
@@ -32,6 +32,8 @@ from collections import namedtuple
 from email.header import decode_header
 
 from . import(
+    configfile,
+    setup_teardown,
     get_iam_client,
     get_sts_client,
     get_client,