From 73c3b988a964e8897f74cba4f5c913663d294794 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Fri, 19 Sep 2025 10:12:33 -0400 Subject: [PATCH] rename s3tests_boto3/ back to s3tests/ Signed-off-by: Casey Bodley --- README.rst | 20 +++++++++---------- {s3tests_boto3 => s3tests}/__init__.py | 0 {s3tests_boto3 => s3tests}/common.py | 0 .../functional/__init__.py | 0 {s3tests_boto3 => s3tests}/functional/iam.py | 0 .../functional/policy.py | 0 .../functional/rgw_interactive.py | 0 .../functional/test_headers.py | 0 .../functional/test_iam.py | 4 ++-- .../functional/test_s3.py | 0 .../functional/test_s3select.py | 0 .../functional/test_sns.py | 0 .../functional/test_sts.py | 0 .../functional/test_utils.py | 0 .../functional/utils.py | 0 15 files changed, 12 insertions(+), 12 deletions(-) rename {s3tests_boto3 => s3tests}/__init__.py (100%) rename {s3tests_boto3 => s3tests}/common.py (100%) rename {s3tests_boto3 => s3tests}/functional/__init__.py (100%) rename {s3tests_boto3 => s3tests}/functional/iam.py (100%) rename {s3tests_boto3 => s3tests}/functional/policy.py (100%) rename {s3tests_boto3 => s3tests}/functional/rgw_interactive.py (100%) rename {s3tests_boto3 => s3tests}/functional/test_headers.py (100%) rename {s3tests_boto3 => s3tests}/functional/test_iam.py (99%) rename {s3tests_boto3 => s3tests}/functional/test_s3.py (100%) rename {s3tests_boto3 => s3tests}/functional/test_s3select.py (100%) rename {s3tests_boto3 => s3tests}/functional/test_sns.py (100%) rename {s3tests_boto3 => s3tests}/functional/test_sts.py (100%) rename {s3tests_boto3 => s3tests}/functional/test_utils.py (100%) rename {s3tests_boto3 => s3tests}/functional/utils.py (100%) diff --git a/README.rst b/README.rst index 87475e94..0713aeea 100644 --- a/README.rst +++ b/README.rst @@ -22,15 +22,15 @@ Once you have that file copied and edited, you can run the tests with:: You can specify which directory of tests to run:: - S3TEST_CONF=your.conf tox -- s3tests_boto3/functional + S3TEST_CONF=your.conf tox -- s3tests/functional You can specify which file of tests to run:: - S3TEST_CONF=your.conf tox -- s3tests_boto3/functional/test_s3.py + S3TEST_CONF=your.conf tox -- s3tests/functional/test_s3.py You can specify which test to run:: - S3TEST_CONF=your.conf tox -- s3tests_boto3/functional/test_s3.py::test_bucket_list_empty + S3TEST_CONF=your.conf tox -- s3tests/functional/test_s3.py::test_bucket_list_empty Some tests have attributes set based on their current reliability and things like AWS not enforcing their spec stricly. You can filter tests @@ -44,13 +44,13 @@ located in the ``s3test_boto3`` directory. You can run only the boto3 tests with:: - S3TEST_CONF=your.conf tox -- s3tests_boto3/functional + S3TEST_CONF=your.conf tox -- s3tests/functional ======================== STS compatibility tests ======================== -This section contains some basic tests for the AssumeRole, GetSessionToken and AssumeRoleWithWebIdentity API's. The test file is located under ``s3tests_boto3/functional``. +This section contains some basic tests for the AssumeRole, GetSessionToken and AssumeRoleWithWebIdentity API's. The test file is located under ``s3tests/functional``. To run the STS tests, the vstart cluster should be started with the following parameter (in addition to any parameters already used with it):: @@ -63,11 +63,11 @@ After the cluster is up the following command should be executed:: You can run only the sts tests (all the three API's) with:: - S3TEST_CONF=your.conf tox -- s3tests_boto3/functional/test_sts.py + S3TEST_CONF=your.conf tox -- s3tests/functional/test_sts.py You can filter tests based on the attributes. There is a attribute named ``test_of_sts`` to run AssumeRole and GetSessionToken tests and ``webidentity_test`` to run the AssumeRoleWithWebIdentity tests. If you want to execute only ``test_of_sts`` tests you can apply that filter as below:: - S3TEST_CONF=your.conf tox -- -m test_of_sts s3tests_boto3/functional/test_sts.py + S3TEST_CONF=your.conf tox -- -m test_of_sts s3tests/functional/test_sts.py For running ``webidentity_test`` you'll need have Keycloak running. @@ -89,16 +89,16 @@ Adding above capabilities to "iam" user is also taken care by vstart (If Ceph cl To run these tests, create configuration file with section "iam" and "s3 alt" refer s3tests.conf.SAMPLE. Once you have that configuration file copied and edited, you can run all the tests with:: - S3TEST_CONF=your.conf tox -- s3tests_boto3/functional/test_iam.py + S3TEST_CONF=your.conf tox -- s3tests/functional/test_iam.py You can also specify specific test to run:: - S3TEST_CONF=your.conf tox -- s3tests_boto3/functional/test_iam.py::test_put_user_policy + S3TEST_CONF=your.conf tox -- s3tests/functional/test_iam.py::test_put_user_policy Some tests have attributes set such as "fails_on_rgw". You can filter tests based on their attributes:: - S3TEST_CONF=your.conf tox -- s3tests_boto3/functional/test_iam.py -m 'not fails_on_rgw' + S3TEST_CONF=your.conf tox -- s3tests/functional/test_iam.py -m 'not fails_on_rgw' ======================== Bucket logging tests diff --git a/s3tests_boto3/__init__.py b/s3tests/__init__.py similarity index 100% rename from s3tests_boto3/__init__.py rename to s3tests/__init__.py diff --git a/s3tests_boto3/common.py b/s3tests/common.py similarity index 100% rename from s3tests_boto3/common.py rename to s3tests/common.py diff --git a/s3tests_boto3/functional/__init__.py b/s3tests/functional/__init__.py similarity index 100% rename from s3tests_boto3/functional/__init__.py rename to s3tests/functional/__init__.py diff --git a/s3tests_boto3/functional/iam.py b/s3tests/functional/iam.py similarity index 100% rename from s3tests_boto3/functional/iam.py rename to s3tests/functional/iam.py diff --git a/s3tests_boto3/functional/policy.py b/s3tests/functional/policy.py similarity index 100% rename from s3tests_boto3/functional/policy.py rename to s3tests/functional/policy.py diff --git a/s3tests_boto3/functional/rgw_interactive.py b/s3tests/functional/rgw_interactive.py similarity index 100% rename from s3tests_boto3/functional/rgw_interactive.py rename to s3tests/functional/rgw_interactive.py diff --git a/s3tests_boto3/functional/test_headers.py b/s3tests/functional/test_headers.py similarity index 100% rename from s3tests_boto3/functional/test_headers.py rename to s3tests/functional/test_headers.py diff --git a/s3tests_boto3/functional/test_iam.py b/s3tests/functional/test_iam.py similarity index 99% rename from s3tests_boto3/functional/test_iam.py rename to s3tests/functional/test_iam.py index 61a6a485..4fcb8c0b 100644 --- a/s3tests_boto3/functional/test_iam.py +++ b/s3tests/functional/test_iam.py @@ -5,8 +5,8 @@ import time from botocore.exceptions import ClientError import pytest -from s3tests_boto3.functional.utils import assert_raises -from s3tests_boto3.functional.test_s3 import _multipart_upload +from .utils import assert_raises +from .test_s3 import _multipart_upload from . import ( configfile, setup_teardown, diff --git a/s3tests_boto3/functional/test_s3.py b/s3tests/functional/test_s3.py similarity index 100% rename from s3tests_boto3/functional/test_s3.py rename to s3tests/functional/test_s3.py diff --git a/s3tests_boto3/functional/test_s3select.py b/s3tests/functional/test_s3select.py similarity index 100% rename from s3tests_boto3/functional/test_s3select.py rename to s3tests/functional/test_s3select.py diff --git a/s3tests_boto3/functional/test_sns.py b/s3tests/functional/test_sns.py similarity index 100% rename from s3tests_boto3/functional/test_sns.py rename to s3tests/functional/test_sns.py diff --git a/s3tests_boto3/functional/test_sts.py b/s3tests/functional/test_sts.py similarity index 100% rename from s3tests_boto3/functional/test_sts.py rename to s3tests/functional/test_sts.py diff --git a/s3tests_boto3/functional/test_utils.py b/s3tests/functional/test_utils.py similarity index 100% rename from s3tests_boto3/functional/test_utils.py rename to s3tests/functional/test_utils.py diff --git a/s3tests_boto3/functional/utils.py b/s3tests/functional/utils.py similarity index 100% rename from s3tests_boto3/functional/utils.py rename to s3tests/functional/utils.py -- 2.39.5