From 44502588b8e375fc6812ae2abcdf103caa1385c9 Mon Sep 17 00:00:00 2001 From: Rok Mandeljc Date: Fri, 5 Mar 2021 23:02:52 +0100 Subject: [PATCH] tests: extend multipackage test to include numpy Testing with numpy is rather heavy-weight, but it is a sure to reveal any problems. For example, mishandling of extensions that are embedded in package sub-directories. --- .../functional/specs/multipackage-scripts/multipackage1_B.py | 4 ++++ .../functional/specs/multipackage-scripts/multipackage2_B.py | 4 ++++ .../functional/specs/multipackage-scripts/multipackage3_B.py | 4 ++++ .../functional/specs/multipackage-scripts/multipackage4_B.py | 4 ++++ .../functional/specs/multipackage-scripts/multipackage5_B.py | 4 ++++ .../functional/specs/multipackage-scripts/multipackage5_C.py | 4 ++++ .../specs/multipackage-scripts/test_multipackage1.py | 4 ++++ .../specs/multipackage-scripts/test_multipackage2.py | 4 ++++ .../specs/multipackage-scripts/test_multipackage3.py | 4 ++++ .../specs/multipackage-scripts/test_multipackage4.py | 4 ++++ .../specs/multipackage-scripts/test_multipackage5.py | 4 ++++ tests/functional/test_multipackage.py | 3 +++ 12 files changed, 47 insertions(+) diff --git a/tests/functional/specs/multipackage-scripts/multipackage1_B.py b/tests/functional/specs/multipackage-scripts/multipackage1_B.py index 47cf35c5305..7402a1a2504 100644 --- a/tests/functional/specs/multipackage-scripts/multipackage1_B.py +++ b/tests/functional/specs/multipackage-scripts/multipackage1_B.py @@ -26,3 +26,7 @@ secret = fp.read().strip() print("Read secret from %s: %r" % (secret_file, secret)) assert secret == 'Secret1234' + +# import numpy, which has several extensions in its package subdirectories +import numpy # noqa: E402, F401 +print("Imported numpy!") diff --git a/tests/functional/specs/multipackage-scripts/multipackage2_B.py b/tests/functional/specs/multipackage-scripts/multipackage2_B.py index 47cf35c5305..7402a1a2504 100644 --- a/tests/functional/specs/multipackage-scripts/multipackage2_B.py +++ b/tests/functional/specs/multipackage-scripts/multipackage2_B.py @@ -26,3 +26,7 @@ secret = fp.read().strip() print("Read secret from %s: %r" % (secret_file, secret)) assert secret == 'Secret1234' + +# import numpy, which has several extensions in its package subdirectories +import numpy # noqa: E402, F401 +print("Imported numpy!") diff --git a/tests/functional/specs/multipackage-scripts/multipackage3_B.py b/tests/functional/specs/multipackage-scripts/multipackage3_B.py index 47cf35c5305..7402a1a2504 100644 --- a/tests/functional/specs/multipackage-scripts/multipackage3_B.py +++ b/tests/functional/specs/multipackage-scripts/multipackage3_B.py @@ -26,3 +26,7 @@ secret = fp.read().strip() print("Read secret from %s: %r" % (secret_file, secret)) assert secret == 'Secret1234' + +# import numpy, which has several extensions in its package subdirectories +import numpy # noqa: E402, F401 +print("Imported numpy!") diff --git a/tests/functional/specs/multipackage-scripts/multipackage4_B.py b/tests/functional/specs/multipackage-scripts/multipackage4_B.py index 47cf35c5305..7402a1a2504 100644 --- a/tests/functional/specs/multipackage-scripts/multipackage4_B.py +++ b/tests/functional/specs/multipackage-scripts/multipackage4_B.py @@ -26,3 +26,7 @@ secret = fp.read().strip() print("Read secret from %s: %r" % (secret_file, secret)) assert secret == 'Secret1234' + +# import numpy, which has several extensions in its package subdirectories +import numpy # noqa: E402, F401 +print("Imported numpy!") diff --git a/tests/functional/specs/multipackage-scripts/multipackage5_B.py b/tests/functional/specs/multipackage-scripts/multipackage5_B.py index 47cf35c5305..7402a1a2504 100644 --- a/tests/functional/specs/multipackage-scripts/multipackage5_B.py +++ b/tests/functional/specs/multipackage-scripts/multipackage5_B.py @@ -26,3 +26,7 @@ secret = fp.read().strip() print("Read secret from %s: %r" % (secret_file, secret)) assert secret == 'Secret1234' + +# import numpy, which has several extensions in its package subdirectories +import numpy # noqa: E402, F401 +print("Imported numpy!") diff --git a/tests/functional/specs/multipackage-scripts/multipackage5_C.py b/tests/functional/specs/multipackage-scripts/multipackage5_C.py index 47cf35c5305..7402a1a2504 100644 --- a/tests/functional/specs/multipackage-scripts/multipackage5_C.py +++ b/tests/functional/specs/multipackage-scripts/multipackage5_C.py @@ -26,3 +26,7 @@ secret = fp.read().strip() print("Read secret from %s: %r" % (secret_file, secret)) assert secret == 'Secret1234' + +# import numpy, which has several extensions in its package subdirectories +import numpy # noqa: E402, F401 +print("Imported numpy!") diff --git a/tests/functional/specs/multipackage-scripts/test_multipackage1.py b/tests/functional/specs/multipackage-scripts/test_multipackage1.py index 47cf35c5305..7402a1a2504 100644 --- a/tests/functional/specs/multipackage-scripts/test_multipackage1.py +++ b/tests/functional/specs/multipackage-scripts/test_multipackage1.py @@ -26,3 +26,7 @@ secret = fp.read().strip() print("Read secret from %s: %r" % (secret_file, secret)) assert secret == 'Secret1234' + +# import numpy, which has several extensions in its package subdirectories +import numpy # noqa: E402, F401 +print("Imported numpy!") diff --git a/tests/functional/specs/multipackage-scripts/test_multipackage2.py b/tests/functional/specs/multipackage-scripts/test_multipackage2.py index 47cf35c5305..7402a1a2504 100644 --- a/tests/functional/specs/multipackage-scripts/test_multipackage2.py +++ b/tests/functional/specs/multipackage-scripts/test_multipackage2.py @@ -26,3 +26,7 @@ secret = fp.read().strip() print("Read secret from %s: %r" % (secret_file, secret)) assert secret == 'Secret1234' + +# import numpy, which has several extensions in its package subdirectories +import numpy # noqa: E402, F401 +print("Imported numpy!") diff --git a/tests/functional/specs/multipackage-scripts/test_multipackage3.py b/tests/functional/specs/multipackage-scripts/test_multipackage3.py index 47cf35c5305..7402a1a2504 100644 --- a/tests/functional/specs/multipackage-scripts/test_multipackage3.py +++ b/tests/functional/specs/multipackage-scripts/test_multipackage3.py @@ -26,3 +26,7 @@ secret = fp.read().strip() print("Read secret from %s: %r" % (secret_file, secret)) assert secret == 'Secret1234' + +# import numpy, which has several extensions in its package subdirectories +import numpy # noqa: E402, F401 +print("Imported numpy!") diff --git a/tests/functional/specs/multipackage-scripts/test_multipackage4.py b/tests/functional/specs/multipackage-scripts/test_multipackage4.py index 47cf35c5305..7402a1a2504 100644 --- a/tests/functional/specs/multipackage-scripts/test_multipackage4.py +++ b/tests/functional/specs/multipackage-scripts/test_multipackage4.py @@ -26,3 +26,7 @@ secret = fp.read().strip() print("Read secret from %s: %r" % (secret_file, secret)) assert secret == 'Secret1234' + +# import numpy, which has several extensions in its package subdirectories +import numpy # noqa: E402, F401 +print("Imported numpy!") diff --git a/tests/functional/specs/multipackage-scripts/test_multipackage5.py b/tests/functional/specs/multipackage-scripts/test_multipackage5.py index 47cf35c5305..7402a1a2504 100644 --- a/tests/functional/specs/multipackage-scripts/test_multipackage5.py +++ b/tests/functional/specs/multipackage-scripts/test_multipackage5.py @@ -26,3 +26,7 @@ secret = fp.read().strip() print("Read secret from %s: %r" % (secret_file, secret)) assert secret == 'Secret1234' + +# import numpy, which has several extensions in its package subdirectories +import numpy # noqa: E402, F401 +print("Imported numpy!") diff --git a/tests/functional/test_multipackage.py b/tests/functional/test_multipackage.py index 817e4d785fb..afe0c029729 100644 --- a/tests/functional/test_multipackage.py +++ b/tests/functional/test_multipackage.py @@ -1,6 +1,9 @@ import pytest +from PyInstaller.utils.tests import importorskip + +@importorskip('numpy') @pytest.mark.parametrize( "spec_file", (