8000 test: run tests with external blobstore mgmt by jennifer-richards · Pull Request #8542 · ietf-tools/datatracker · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

test: run tests with external blobstore mgmt #8542

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
merged 3 commits into from
Feb 15, 2025
Merged

test: run tests with external blobstore mgmt #8542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5ac102
test: --no-manage-blobstore option for running tests
jennifer-richards Feb 14, 2025
332dafc
test: use blob store settings from env, if set
jennifer-richards Feb 15, 2025
7130e3c
test: actually set a couple more storage opts
jennifer-richards Feb 15, 2025
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
18 changes: 13 additions & 5 deletions ietf/settings_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,16 +106,24 @@ def tempdir_with_cleanup(**kwargs):
},
}

# Configure storages for the blob store - use env settings if present. See the --no-manage-blobstore test option.
_blob_store_endpoint_url = os.environ.get("DATATRACKER_BLOB_STORE_ENDPOINT_URL", "http://blobstore:9000")
_blob_store_access_key = os.environ.get("DATATRACKER_BLOB_STORE_ACCESS_KEY", "minio_root")
_blob_store_secret_key = os.environ.get("DATATRACKER_BLOB_STORE_SECRET_KEY", "minio_pass")
_blob_store_bucket_prefix = os.environ.get("DATATRACKER_BLOB_STORE_BUCKET_PREFIX", "test-")
_blob_store_enable_profiling = (
os.environ.get("DATATRACKER_BLOB_STORE_ENABLE_PROFILING", "false").lower() == "true"
)
for storagename in MORE_STORAGE_NAMES:
STORAGES[storagename] = {
"BACKEND": "ietf.doc.storage_backends.CustomS3Storage",
"OPTIONS": dict(
endpoint_url="http://blobstore:9000",
access_key="minio_root",
secret_key="minio_pass",
endpoint_url=_blob_store_endpoint_url,
access_key=_blob_store_access_key,
secret_key=_blob_store_secret_key,
security_token=None,
client_config=boto3.session.Config(signature_version="s3v4"),
verify=False,
bucket_name=f"test-{storagename}",
bucket_name=f"{_blob_store_bucket_prefix}{storagename}",
ietf_log_blob_timing=_blob_store_enable_profiling,
),
}
30 changes: 24 additions & 6 deletions ietf/utils/test_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,9 +723,25 @@ def add_arguments(cls, parser):
parser.add_argument('--rerun-until-failure',
action='store_true', dest='rerun', default=False,
help='Run the indicated tests in a loop until a failure occurs. ' )

def __init__(self, ignore_lower_coverage=False, skip_coverage=False, save_version_coverage=None, html_report=None, permit_mixed_migrations=None, show_logging=None, validate_html=None, validate_html_harder=None, rerun=None, **kwargs):
#
parser.add_argument('--no-manage-blobstore', action='store_false', dest='manage_blobstore',
help='Disable creating/deleting test buckets in the blob store.'
'When this argument is used, a set of buckets with "test-" prefixed to their '
'names must already exist.')

def __init__(
self,
ignore_lower_coverage=False,
skip_coverage=False,
save_version_coverage=None,
html_report=None,
permit_mixed_migrations=None,
show_logging=None,
validate_html=None,
validate_html_harder=None,
rerun=None,
manage_blobstore=True,
**kwargs
): #
self.ignore_lower_coverage = ignore_lower_coverage
self.check_coverage = not skip_coverage
self.save_version_coverage = save_version_coverage
Expand Down Expand Up @@ -754,7 +770,7 @@ def __init__(self, ignore_lower_coverage=False, skip_coverage=False, save_versio
# specific classes necessary to get the right ordering:
self.reorder_by = (PyFlakesTestCase, MyPyTest,) + self.reorder_by + (StaticLiveServerTestCase, TemplateTagTest, CoverageTest,)
#self.buckets = set()
self.blobstoremanager = TestBlobstoreManager()
self.blobstoremanager = TestBlobstoreManager() if manage_blobstore else None

def setup_test_environment(self, **kwargs):
global template_coverage_collection
Expand Down Expand Up @@ -939,7 +955,8 @@ def setup_test_environment(self, **kwargs):
print(" (extra pedantically)")
self.vnu = start_vnu_server()

self.blobstoremanager.createTestBlobstores()
if self.blobstoremanager is not None:
self.blobstoremanager.createTestBlobstores()

super(IetfTestRunner, self).setup_test_environment(**kwargs)

Expand Down Expand Up @@ -971,7 +988,8 @@ def teardown_test_environment(self, **kwargs):
if self.vnu:
self.vnu.terminate()

self.blobstoremanager.destroyTestBlobstores()
if self.blobstoremanager is not None:
self.blobstoremanager.destroyTestBlobstores()

super(IetfTestRunner, self).teardown_test_environment(**kwargs)

Expand Down
Loading
0