tests: rename testcommon module to shared_test_code
This name always confuses me, since there is also test_common.py. And this module is not actually a test suite, even though it starts with "test". This also makes for better tab completion, e.g. python3 -m unittest tests/te[Tab] -> tests/test_
This commit is contained in:
parent
f9431aaf0f
commit
66d220bd9f
@ -721,6 +721,7 @@ include tests/repo/v1.v2.sig_1020.apk
|
|||||||
include tests/run-tests
|
include tests/run-tests
|
||||||
include tests/SANAPPSI.RSA
|
include tests/SANAPPSI.RSA
|
||||||
include tests/SANAPPSI.SF
|
include tests/SANAPPSI.SF
|
||||||
|
include tests/shared_test_code.py
|
||||||
include tests/signindex/guardianproject.jar
|
include tests/signindex/guardianproject.jar
|
||||||
include tests/signindex/guardianproject-v1.jar
|
include tests/signindex/guardianproject-v1.jar
|
||||||
include tests/signindex/testy.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/yuriykulikov/AlarmClock/gradle/wrapper/gradle-wrapper.properties
|
||||||
include tests/source-files/Zillode/syncthing-silk/build.gradle
|
include tests/source-files/Zillode/syncthing-silk/build.gradle
|
||||||
include tests/SpeedoMeterApp.main_1.apk
|
include tests/SpeedoMeterApp.main_1.apk
|
||||||
include tests/testcommon.py
|
|
||||||
include tests/test_build.py
|
include tests/test_build.py
|
||||||
include tests/test_checkupdates.py
|
include tests/test_checkupdates.py
|
||||||
include tests/test_common.py
|
include tests/test_common.py
|
||||||
|
@ -8,7 +8,7 @@ from unittest import mock
|
|||||||
|
|
||||||
import fdroidserver
|
import fdroidserver
|
||||||
from fdroidserver import common, signindex
|
from fdroidserver import common, signindex
|
||||||
from .testcommon import GP_FINGERPRINT, mkdtemp
|
from .shared_test_code import GP_FINGERPRINT, mkdtemp
|
||||||
|
|
||||||
|
|
||||||
basedir = Path(__file__).parent
|
basedir = Path(__file__).parent
|
||||||
|
@ -9,7 +9,7 @@ import yaml
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from unittest import mock
|
from unittest import mock
|
||||||
|
|
||||||
from .testcommon import TmpCwd, mkdtemp
|
from .shared_test_code import TmpCwd, mkdtemp
|
||||||
|
|
||||||
import fdroidserver.build
|
import fdroidserver.build
|
||||||
import fdroidserver.common
|
import fdroidserver.common
|
||||||
|
@ -30,7 +30,7 @@ import fdroidserver
|
|||||||
import fdroidserver.signindex
|
import fdroidserver.signindex
|
||||||
import fdroidserver.common
|
import fdroidserver.common
|
||||||
import fdroidserver.metadata
|
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.common import ANTIFEATURES_CONFIG_NAME, CATEGORIES_CONFIG_NAME
|
||||||
from fdroidserver.exception import FDroidException, VCSException,\
|
from fdroidserver.exception import FDroidException, VCSException,\
|
||||||
MetaDataException, VerificationException
|
MetaDataException, VerificationException
|
||||||
|
@ -11,7 +11,7 @@ from unittest import mock
|
|||||||
import git
|
import git
|
||||||
|
|
||||||
import fdroidserver
|
import fdroidserver
|
||||||
from .testcommon import TmpCwd, mkdtemp, VerboseFalseOptions
|
from .shared_test_code import TmpCwd, mkdtemp, VerboseFalseOptions
|
||||||
|
|
||||||
basedir = Path(__file__).parent
|
basedir = Path(__file__).parent
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
import unittest
|
import unittest
|
||||||
import unittest.mock
|
import unittest.mock
|
||||||
|
|
||||||
from .testcommon import mock_urlopen
|
from .shared_test_code import mock_urlopen
|
||||||
import fdroidserver
|
import fdroidserver
|
||||||
|
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ import git
|
|||||||
import requests
|
import requests
|
||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
from .testcommon import TmpCwd, mkdtemp, VerboseFalseOptions
|
from .shared_test_code import TmpCwd, mkdtemp, VerboseFalseOptions
|
||||||
|
|
||||||
import fdroidserver
|
import fdroidserver
|
||||||
import fdroidserver.import_subcommand
|
import fdroidserver.import_subcommand
|
||||||
|
@ -16,7 +16,7 @@ import shutil
|
|||||||
|
|
||||||
import fdroidserver
|
import fdroidserver
|
||||||
from fdroidserver import common, index, publish, signindex, update
|
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
|
basedir = Path(__file__).parent
|
||||||
|
@ -8,7 +8,7 @@ import unittest
|
|||||||
|
|
||||||
import fdroidserver.common
|
import fdroidserver.common
|
||||||
import fdroidserver.init
|
import fdroidserver.init
|
||||||
from . import testcommon
|
from .shared_test_code import mkdtemp
|
||||||
|
|
||||||
basedir = pathlib.Path(__file__).parent
|
basedir = pathlib.Path(__file__).parent
|
||||||
|
|
||||||
@ -19,7 +19,7 @@ class InitTest(unittest.TestCase):
|
|||||||
def setUp(self):
|
def setUp(self):
|
||||||
fdroidserver.common.config = None
|
fdroidserver.common.config = None
|
||||||
fdroidserver.init.config = None
|
fdroidserver.init.config = None
|
||||||
self._td = testcommon.mkdtemp()
|
self._td = mkdtemp()
|
||||||
self.testdir = self._td.name
|
self.testdir = self._td.name
|
||||||
os.chdir(self.testdir)
|
os.chdir(self.testdir)
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ from pathlib import Path
|
|||||||
|
|
||||||
import ruamel.yaml
|
import ruamel.yaml
|
||||||
|
|
||||||
from .testcommon import mkdtemp
|
from .shared_test_code import mkdtemp
|
||||||
|
|
||||||
import fdroidserver.common
|
import fdroidserver.common
|
||||||
import fdroidserver.lint
|
import fdroidserver.lint
|
||||||
|
@ -8,7 +8,7 @@ import tempfile
|
|||||||
from unittest import mock
|
from unittest import mock
|
||||||
|
|
||||||
import fdroidserver.__main__
|
import fdroidserver.__main__
|
||||||
from .testcommon import TmpCwd, TmpPyPath
|
from .shared_test_code import TmpCwd, TmpPyPath
|
||||||
|
|
||||||
|
|
||||||
class MainTest(unittest.TestCase):
|
class MainTest(unittest.TestCase):
|
||||||
|
@ -17,7 +17,7 @@ import fdroidserver
|
|||||||
from fdroidserver import metadata
|
from fdroidserver import metadata
|
||||||
from fdroidserver.exception import MetaDataException
|
from fdroidserver.exception import MetaDataException
|
||||||
from fdroidserver.common import DEFAULT_LOCALE
|
from fdroidserver.common import DEFAULT_LOCALE
|
||||||
from .testcommon import TmpCwd, mkdtemp
|
from .shared_test_code import TmpCwd, mkdtemp
|
||||||
|
|
||||||
|
|
||||||
basedir = Path(__file__).parent
|
basedir = Path(__file__).parent
|
||||||
|
@ -24,7 +24,7 @@ from fdroidserver import common
|
|||||||
from fdroidserver import metadata
|
from fdroidserver import metadata
|
||||||
from fdroidserver import signatures
|
from fdroidserver import signatures
|
||||||
from fdroidserver.exception import FDroidException
|
from fdroidserver.exception import FDroidException
|
||||||
from .testcommon import mkdtemp, VerboseFalseOptions
|
from .shared_test_code import mkdtemp, VerboseFalseOptions
|
||||||
|
|
||||||
basedir = pathlib.Path(__file__).parent
|
basedir = pathlib.Path(__file__).parent
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@ from pathlib import Path
|
|||||||
from unittest import mock
|
from unittest import mock
|
||||||
|
|
||||||
from fdroidserver import metadata, rewritemeta
|
from fdroidserver import metadata, rewritemeta
|
||||||
from .testcommon import TmpCwd, mkdtemp
|
from .shared_test_code import TmpCwd, mkdtemp
|
||||||
|
|
||||||
basedir = Path(__file__).parent
|
basedir = Path(__file__).parent
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@ import fdroidserver.build
|
|||||||
import fdroidserver.common
|
import fdroidserver.common
|
||||||
import fdroidserver.metadata
|
import fdroidserver.metadata
|
||||||
import fdroidserver.scanner
|
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
|
basedir = pathlib.Path(__file__).parent
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ import os
|
|||||||
import unittest
|
import unittest
|
||||||
from tempfile import TemporaryDirectory
|
from tempfile import TemporaryDirectory
|
||||||
|
|
||||||
from .testcommon import TmpCwd
|
from .shared_test_code import TmpCwd
|
||||||
from fdroidserver import common, signatures
|
from fdroidserver import common, signatures
|
||||||
|
|
||||||
basedir = os.path.dirname(__file__)
|
basedir = os.path.dirname(__file__)
|
||||||
|
@ -48,7 +48,7 @@ import fdroidserver.metadata
|
|||||||
import fdroidserver.update
|
import fdroidserver.update
|
||||||
from fdroidserver.common import CATEGORIES_CONFIG_NAME
|
from fdroidserver.common import CATEGORIES_CONFIG_NAME
|
||||||
from fdroidserver.looseversion import LooseVersion
|
from fdroidserver.looseversion import LooseVersion
|
||||||
from .testcommon import TmpCwd, mkdtemp
|
from .shared_test_code import TmpCwd, mkdtemp
|
||||||
from PIL import PngImagePlugin
|
from PIL import PngImagePlugin
|
||||||
|
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@ from git import Repo
|
|||||||
|
|
||||||
import fdroidserver.common
|
import fdroidserver.common
|
||||||
import fdroidserver.metadata
|
import fdroidserver.metadata
|
||||||
from .testcommon import mkdtemp, VerboseFalseOptions
|
from .shared_test_code import mkdtemp, VerboseFalseOptions
|
||||||
|
|
||||||
|
|
||||||
class VCSTest(unittest.TestCase):
|
class VCSTest(unittest.TestCase):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user