Skip to content

tests(storage): move systest to 'tests/system' directory #9777

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

Closed
tseaver wants to merge 1 commit into from
Closed

tests(storage): move systest to 'tests/system' directory #9777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion storage/noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def system(session):
session.install("-e", ".")

# Run py.test against the system tests.
session.run("py.test", "--quiet", "tests/system.py", *session.posargs)
session.run("py.test", "--quiet", "tests/system", *session.posargs)


@nox.session(python="3.6")
Expand Down
9 changes: 5 additions & 4 deletions storage/tests/system.py → storage/tests/system/test_system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@


USER_PROJECT = os.environ.get("GOOGLE_CLOUD_TESTS_USER_PROJECT")
DIRNAME = os.path.realpath(os.path.dirname(__file__))
DATA_DIRNAME = os.path.abspath(os.path.join(DIRNAME, "..", "data"))


def _bad_copy(bad_request):
Expand Down Expand Up @@ -381,11 +383,10 @@ def test_bucket_get_blob_with_user_project(self):

class TestStorageFiles(unittest.TestCase):

DIRNAME = os.path.realpath(os.path.dirname(__file__))
FILES = {
"logo": {"path": DIRNAME + "/data/CloudPlatform_128px_Retina.png"},
"big": {"path": DIRNAME + "/data/five-point-one-mb-file.zip"},
"simple": {"path": DIRNAME + "/data/simple.txt"},
"logo": {"path": DATA_DIRNAME + "/CloudPlatform_128px_Retina.png"},
"big": {"path": DATA_DIRNAME + "/five-point-one-mb-file.zip"},
"simple": {"path": DATA_DIRNAME + "/simple.txt"},
}

@classmethod
Expand Down