New skip conditions for unpickle-patching tests (#15329)
* New running conditions for tests * found one more mistake
This commit is contained in:
parent
ac89d70d4a
commit
6ee1f6c4b7
|
@ -4,8 +4,9 @@ import sys
|
|||
|
||||
import pytest
|
||||
import torch
|
||||
from lightning_utilities.core.imports import package_available
|
||||
from packaging.version import Version
|
||||
|
||||
import pytorch_lightning # noqa: F401
|
||||
from tests_pytorch.checkpointing.test_legacy_checkpoints import (
|
||||
CHECKPOINT_EXTENSION,
|
||||
LEGACY_BACK_COMPATIBLE_PL_VERSIONS,
|
||||
|
@ -16,7 +17,7 @@ from tests_pytorch.helpers.utils import no_warning_call
|
|||
|
||||
@pytest.mark.parametrize("pl_version", LEGACY_BACK_COMPATIBLE_PL_VERSIONS)
|
||||
@pytest.mark.skipif(
|
||||
not "pytorch_" + "lightning" in sys.modules, reason="This test is only relevant for the standalone package"
|
||||
package_available("lightning.pytorch"), reason="This test is only relevant for the standalone package"
|
||||
)
|
||||
def test_imports_standalone(pl_version: str):
|
||||
assert any(
|
||||
|
@ -40,7 +41,8 @@ def test_imports_standalone(pl_version: str):
|
|||
|
||||
@pytest.mark.parametrize("pl_version", LEGACY_BACK_COMPATIBLE_PL_VERSIONS)
|
||||
@pytest.mark.skipif(
|
||||
"pytorch_" + "lightning" in sys.modules, reason="This test is only relevant for the unified package"
|
||||
not package_available("lightning.pytorch"),
|
||||
reason="This test is only relevant for the unified package",
|
||||
)
|
||||
def test_imports_unified(pl_version: str):
|
||||
assert any(
|
||||
|
@ -55,7 +57,12 @@ def test_imports_unified(pl_version: str):
|
|||
assert path_ckpts, f'No checkpoints found in folder "{path_legacy}"'
|
||||
path_ckpt = path_ckpts[-1]
|
||||
|
||||
with pytest.warns(match="Redirecting imports of"):
|
||||
# only below version 1.5.0 we pickled stuff in checkpoints
|
||||
if Version(pl_version) < Version("1.5.0"):
|
||||
context = pytest.warns(UserWarning, match="Redirecting import of")
|
||||
else:
|
||||
context = no_warning_call(match="Redirecting import of*")
|
||||
with context:
|
||||
torch.load(path_ckpt)
|
||||
|
||||
assert any(
|
||||
|
|
Loading…
Reference in New Issue