diff --git a/MANIFEST.in b/MANIFEST.in index 42e1f46e..4f14a48d 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -721,6 +721,7 @@ include tests/repo/v1.v2.sig_1020.apk include tests/run-tests include tests/SANAPPSI.RSA include tests/SANAPPSI.SF +include tests/shared_test_code.py include tests/signindex/guardianproject.jar include tests/signindex/guardianproject-v1.jar include tests/signindex/testy.jar @@ -845,7 +846,6 @@ include tests/source-files/ut.ewh.audiometrytest/settings.gradle include tests/source-files/yuriykulikov/AlarmClock/gradle/wrapper/gradle-wrapper.properties include tests/source-files/Zillode/syncthing-silk/build.gradle include tests/SpeedoMeterApp.main_1.apk -include tests/testcommon.py include tests/test_build.py include tests/test_checkupdates.py include tests/test_common.py diff --git a/tests/testcommon.py b/tests/shared_test_code.py similarity index 100% rename from tests/testcommon.py rename to tests/shared_test_code.py diff --git a/tests/test_api.py b/tests/test_api.py index a2d91926..6cb9a53b 100755 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -8,7 +8,7 @@ from unittest import mock import fdroidserver from fdroidserver import common, signindex -from .testcommon import GP_FINGERPRINT, mkdtemp +from .shared_test_code import GP_FINGERPRINT, mkdtemp basedir = Path(__file__).parent diff --git a/tests/test_build.py b/tests/test_build.py index 94596daa..83e33eb2 100755 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -9,7 +9,7 @@ import yaml from pathlib import Path from unittest import mock -from .testcommon import TmpCwd, mkdtemp +from .shared_test_code import TmpCwd, mkdtemp import fdroidserver.build import fdroidserver.common diff --git a/tests/test_common.py b/tests/test_common.py index ad04d389..79b676aa 100755 --- a/tests/test_common.py +++ b/tests/test_common.py @@ -30,7 +30,7 @@ import fdroidserver import fdroidserver.signindex import fdroidserver.common import fdroidserver.metadata -from .testcommon import TmpCwd, mkdtemp +from .shared_test_code import TmpCwd, mkdtemp from fdroidserver.common import ANTIFEATURES_CONFIG_NAME, CATEGORIES_CONFIG_NAME from fdroidserver.exception import FDroidException, VCSException,\ MetaDataException, VerificationException diff --git a/tests/test_deploy.py b/tests/test_deploy.py index 6ca8a40c..0946ebbb 100755 --- a/tests/test_deploy.py +++ b/tests/test_deploy.py @@ -11,7 +11,7 @@ from unittest import mock import git import fdroidserver -from .testcommon import TmpCwd, mkdtemp, VerboseFalseOptions +from .shared_test_code import TmpCwd, mkdtemp, VerboseFalseOptions basedir = Path(__file__).parent diff --git a/tests/test_github.py b/tests/test_github.py index e1e9ac3e..39514c5d 100755 --- a/tests/test_github.py +++ b/tests/test_github.py @@ -3,7 +3,7 @@ import unittest import unittest.mock -from .testcommon import mock_urlopen +from .shared_test_code import mock_urlopen import fdroidserver diff --git a/tests/test_import_subcommand.py b/tests/test_import_subcommand.py index ba2f133a..05e2c379 100755 --- a/tests/test_import_subcommand.py +++ b/tests/test_import_subcommand.py @@ -13,7 +13,7 @@ import git import requests import yaml -from .testcommon import TmpCwd, mkdtemp, VerboseFalseOptions +from .shared_test_code import TmpCwd, mkdtemp, VerboseFalseOptions import fdroidserver import fdroidserver.import_subcommand diff --git a/tests/test_index.py b/tests/test_index.py index 7e315daa..ea08653b 100755 --- a/tests/test_index.py +++ b/tests/test_index.py @@ -16,7 +16,7 @@ import shutil import fdroidserver from fdroidserver import common, index, publish, signindex, update -from .testcommon import GP_FINGERPRINT, TmpCwd, mkdtemp +from .shared_test_code import GP_FINGERPRINT, TmpCwd, mkdtemp basedir = Path(__file__).parent diff --git a/tests/test_init.py b/tests/test_init.py index fcbc83d0..b448192f 100755 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -8,7 +8,7 @@ import unittest import fdroidserver.common import fdroidserver.init -from . import testcommon +from .shared_test_code import mkdtemp basedir = pathlib.Path(__file__).parent @@ -19,7 +19,7 @@ class InitTest(unittest.TestCase): def setUp(self): fdroidserver.common.config = None fdroidserver.init.config = None - self._td = testcommon.mkdtemp() + self._td = mkdtemp() self.testdir = self._td.name os.chdir(self.testdir) diff --git a/tests/test_lint.py b/tests/test_lint.py index f70b03b2..4056b2a6 100755 --- a/tests/test_lint.py +++ b/tests/test_lint.py @@ -9,7 +9,7 @@ from pathlib import Path import ruamel.yaml -from .testcommon import mkdtemp +from .shared_test_code import mkdtemp import fdroidserver.common import fdroidserver.lint diff --git a/tests/test_main.py b/tests/test_main.py index 25da93fa..50fda3e2 100755 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -8,7 +8,7 @@ import tempfile from unittest import mock import fdroidserver.__main__ -from .testcommon import TmpCwd, TmpPyPath +from .shared_test_code import TmpCwd, TmpPyPath class MainTest(unittest.TestCase): diff --git a/tests/test_metadata.py b/tests/test_metadata.py index cd4d12a9..7c9940f9 100755 --- a/tests/test_metadata.py +++ b/tests/test_metadata.py @@ -17,7 +17,7 @@ import fdroidserver from fdroidserver import metadata from fdroidserver.exception import MetaDataException from fdroidserver.common import DEFAULT_LOCALE -from .testcommon import TmpCwd, mkdtemp +from .shared_test_code import TmpCwd, mkdtemp basedir = Path(__file__).parent diff --git a/tests/test_publish.py b/tests/test_publish.py index 6ca3b116..2f8be36a 100755 --- a/tests/test_publish.py +++ b/tests/test_publish.py @@ -24,7 +24,7 @@ from fdroidserver import common from fdroidserver import metadata from fdroidserver import signatures from fdroidserver.exception import FDroidException -from .testcommon import mkdtemp, VerboseFalseOptions +from .shared_test_code import mkdtemp, VerboseFalseOptions basedir = pathlib.Path(__file__).parent diff --git a/tests/test_rewritemeta.py b/tests/test_rewritemeta.py index 854553e3..5ad1b94d 100755 --- a/tests/test_rewritemeta.py +++ b/tests/test_rewritemeta.py @@ -8,7 +8,7 @@ from pathlib import Path from unittest import mock from fdroidserver import metadata, rewritemeta -from .testcommon import TmpCwd, mkdtemp +from .shared_test_code import TmpCwd, mkdtemp basedir = Path(__file__).parent diff --git a/tests/test_scanner.py b/tests/test_scanner.py index 8935a575..592680ef 100755 --- a/tests/test_scanner.py +++ b/tests/test_scanner.py @@ -24,7 +24,7 @@ import fdroidserver.build import fdroidserver.common import fdroidserver.metadata import fdroidserver.scanner -from .testcommon import TmpCwd, mkdtemp, mock_open_to_str +from .shared_test_code import TmpCwd, mkdtemp, mock_open_to_str basedir = pathlib.Path(__file__).parent diff --git a/tests/test_signatures.py b/tests/test_signatures.py index 5444dc23..34722e83 100755 --- a/tests/test_signatures.py +++ b/tests/test_signatures.py @@ -5,7 +5,7 @@ import os import unittest from tempfile import TemporaryDirectory -from .testcommon import TmpCwd +from .shared_test_code import TmpCwd from fdroidserver import common, signatures basedir = os.path.dirname(__file__) diff --git a/tests/test_update.py b/tests/test_update.py index 1c110343..28dd27f9 100755 --- a/tests/test_update.py +++ b/tests/test_update.py @@ -48,7 +48,7 @@ import fdroidserver.metadata import fdroidserver.update from fdroidserver.common import CATEGORIES_CONFIG_NAME from fdroidserver.looseversion import LooseVersion -from .testcommon import TmpCwd, mkdtemp +from .shared_test_code import TmpCwd, mkdtemp from PIL import PngImagePlugin diff --git a/tests/test_vcs.py b/tests/test_vcs.py index 93fcd6a7..2b640a9e 100755 --- a/tests/test_vcs.py +++ b/tests/test_vcs.py @@ -7,7 +7,7 @@ from git import Repo import fdroidserver.common import fdroidserver.metadata -from .testcommon import mkdtemp, VerboseFalseOptions +from .shared_test_code import mkdtemp, VerboseFalseOptions class VCSTest(unittest.TestCase):