From 6f0172497593b05f5c590c3c5b921949fdae54b3 Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Wed, 24 Jul 2024 08:51:01 -0700 Subject: [PATCH] Move test support to root of model_signing. (#252) Since we will need to share some of the models with other directories besides serialization, the only way to achieve this without duplication is to have `conftest.py` in the root testing directory. And, when moving that, we also need to move `test_support.py` which defines useful constants used both in tests and in `conftest.py`. Signed-off-by: Mihai Maruseac --- model_signing/{serialization => }/conftest.py | 2 +- .../serialize_by_file_shard_test.py | 16 +++++++++------- .../serialization/serialize_by_file_test.py | 16 +++++++++------- .../{serialization => }/test_support.py | 0 4 files changed, 19 insertions(+), 15 deletions(-) rename model_signing/{serialization => }/conftest.py (98%) rename model_signing/{serialization => }/test_support.py (100%) diff --git a/model_signing/serialization/conftest.py b/model_signing/conftest.py similarity index 98% rename from model_signing/serialization/conftest.py rename to model_signing/conftest.py index addc9a6a..55f403ca 100644 --- a/model_signing/serialization/conftest.py +++ b/model_signing/conftest.py @@ -16,7 +16,7 @@ import pytest -from model_signing.serialization import test_support +from model_signing import test_support def pytest_addoption(parser): diff --git a/model_signing/serialization/serialize_by_file_shard_test.py b/model_signing/serialization/serialize_by_file_shard_test.py index 33510ef0..750a9454 100644 --- a/model_signing/serialization/serialize_by_file_shard_test.py +++ b/model_signing/serialization/serialize_by_file_shard_test.py @@ -12,6 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. +"""Tests for shard serializers. + +NOTE: This test uses a golden setup to compute digest of several test +models. If the golden tests are failing, regenerate the golden files with + + pytest model_signing/ --update_goldens +""" + import dataclasses import pathlib import pytest @@ -20,13 +28,7 @@ from model_signing.hashing import memory from model_signing.manifest import manifest from model_signing.serialization import serialize_by_file_shard -from model_signing.serialization import test_support - - -# NOTE: This test uses a golden setup to compute digest of several test -# models. If the golden tests are failing, regenerate the golden files with -# -# pytest model_signing/serialization/ --update_goldens +from model_signing import test_support class TestDigestSerializer: diff --git a/model_signing/serialization/serialize_by_file_test.py b/model_signing/serialization/serialize_by_file_test.py index e4ec9e07..426e90b5 100644 --- a/model_signing/serialization/serialize_by_file_test.py +++ b/model_signing/serialization/serialize_by_file_test.py @@ -12,6 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. +"""Tests for file serializers. + +NOTE: This test uses a goldens setup to compute digest of several test +models. If the golden tests are failing, regenerate the golden files with + + pytest model_signing/ --update_goldens +""" + import os import pathlib import pytest @@ -20,13 +28,7 @@ from model_signing.hashing import memory from model_signing.manifest import manifest from model_signing.serialization import serialize_by_file -from model_signing.serialization import test_support - - -# NOTE: This test uses a goldens setup to compute digest of several test -# models. If the golden tests are failing, regenerate the golden files with -# -# pytest model_signing/serialization/ --update_goldens +from model_signing import test_support class TestDigestSerializer: diff --git a/model_signing/serialization/test_support.py b/model_signing/test_support.py similarity index 100% rename from model_signing/serialization/test_support.py rename to model_signing/test_support.py