From a125df991b332885e79c467469efe7d770243331 Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Sun, 30 Sep 2018 13:57:20 -0700 Subject: [PATCH] Move tests to the root of the repository, in keeping with more common convention. --- {borgmatic/tests => tests}/__init__.py | 0 {borgmatic/tests => tests}/integration/__init__.py | 0 {borgmatic/tests => tests}/integration/commands/__init__.py | 0 .../tests => tests}/integration/commands/test_borgmatic.py | 0 .../tests => tests}/integration/commands/test_convert_config.py | 0 .../integration/commands/test_generate_config.py | 0 {borgmatic/tests => tests}/integration/config/__init__.py | 0 {borgmatic/tests => tests}/integration/config/test_generate.py | 0 {borgmatic/tests => tests}/integration/config/test_legacy.py | 0 {borgmatic/tests => tests}/integration/config/test_validate.py | 0 {borgmatic/tests => tests}/integration/test_version.py | 0 {borgmatic/tests => tests}/unit/__init__.py | 0 {borgmatic/tests => tests}/unit/borg/__init__.py | 0 {borgmatic/tests => tests}/unit/borg/test_check.py | 2 +- {borgmatic/tests => tests}/unit/borg/test_create.py | 2 +- {borgmatic/tests => tests}/unit/borg/test_extract.py | 2 +- {borgmatic/tests => tests}/unit/borg/test_hook.py | 0 {borgmatic/tests => tests}/unit/borg/test_info.py | 2 +- {borgmatic/tests => tests}/unit/borg/test_list.py | 2 +- {borgmatic/tests => tests}/unit/borg/test_prune.py | 2 +- {borgmatic/tests => tests}/unit/commands/__init__.py | 0 {borgmatic/tests => tests}/unit/commands/test_borgmatic.py | 0 {borgmatic/tests => tests}/unit/config/__init__.py | 0 {borgmatic/tests => tests}/unit/config/test_collect.py | 0 {borgmatic/tests => tests}/unit/config/test_convert.py | 0 {borgmatic/tests => tests}/unit/config/test_generate.py | 0 {borgmatic/tests => tests}/unit/config/test_legacy.py | 0 {borgmatic/tests => tests}/unit/config/test_validate.py | 0 {borgmatic/tests => tests}/unit/test_verbosity.py | 0 tox.ini | 2 +- 30 files changed, 7 insertions(+), 7 deletions(-) rename {borgmatic/tests => tests}/__init__.py (100%) rename {borgmatic/tests => tests}/integration/__init__.py (100%) rename {borgmatic/tests => tests}/integration/commands/__init__.py (100%) rename {borgmatic/tests => tests}/integration/commands/test_borgmatic.py (100%) rename {borgmatic/tests => tests}/integration/commands/test_convert_config.py (100%) rename {borgmatic/tests => tests}/integration/commands/test_generate_config.py (100%) rename {borgmatic/tests => tests}/integration/config/__init__.py (100%) rename {borgmatic/tests => tests}/integration/config/test_generate.py (100%) rename {borgmatic/tests => tests}/integration/config/test_legacy.py (100%) rename {borgmatic/tests => tests}/integration/config/test_validate.py (100%) rename {borgmatic/tests => tests}/integration/test_version.py (100%) rename {borgmatic/tests => tests}/unit/__init__.py (100%) rename {borgmatic/tests => tests}/unit/borg/__init__.py (100%) rename {borgmatic/tests => tests}/unit/borg/test_check.py (99%) rename {borgmatic/tests => tests}/unit/borg/test_create.py (99%) rename {borgmatic/tests => tests}/unit/borg/test_extract.py (98%) rename {borgmatic/tests => tests}/unit/borg/test_hook.py (100%) rename {borgmatic/tests => tests}/unit/borg/test_info.py (96%) rename {borgmatic/tests => tests}/unit/borg/test_list.py (96%) rename {borgmatic/tests => tests}/unit/borg/test_prune.py (98%) rename {borgmatic/tests => tests}/unit/commands/__init__.py (100%) rename {borgmatic/tests => tests}/unit/commands/test_borgmatic.py (100%) rename {borgmatic/tests => tests}/unit/config/__init__.py (100%) rename {borgmatic/tests => tests}/unit/config/test_collect.py (100%) rename {borgmatic/tests => tests}/unit/config/test_convert.py (100%) rename {borgmatic/tests => tests}/unit/config/test_generate.py (100%) rename {borgmatic/tests => tests}/unit/config/test_legacy.py (100%) rename {borgmatic/tests => tests}/unit/config/test_validate.py (100%) rename {borgmatic/tests => tests}/unit/test_verbosity.py (100%) diff --git a/borgmatic/tests/__init__.py b/tests/__init__.py similarity index 100% rename from borgmatic/tests/__init__.py rename to tests/__init__.py diff --git a/borgmatic/tests/integration/__init__.py b/tests/integration/__init__.py similarity index 100% rename from borgmatic/tests/integration/__init__.py rename to tests/integration/__init__.py diff --git a/borgmatic/tests/integration/commands/__init__.py b/tests/integration/commands/__init__.py similarity index 100% rename from borgmatic/tests/integration/commands/__init__.py rename to tests/integration/commands/__init__.py diff --git a/borgmatic/tests/integration/commands/test_borgmatic.py b/tests/integration/commands/test_borgmatic.py similarity index 100% rename from borgmatic/tests/integration/commands/test_borgmatic.py rename to tests/integration/commands/test_borgmatic.py diff --git a/borgmatic/tests/integration/commands/test_convert_config.py b/tests/integration/commands/test_convert_config.py similarity index 100% rename from borgmatic/tests/integration/commands/test_convert_config.py rename to tests/integration/commands/test_convert_config.py diff --git a/borgmatic/tests/integration/commands/test_generate_config.py b/tests/integration/commands/test_generate_config.py similarity index 100% rename from borgmatic/tests/integration/commands/test_generate_config.py rename to tests/integration/commands/test_generate_config.py diff --git a/borgmatic/tests/integration/config/__init__.py b/tests/integration/config/__init__.py similarity index 100% rename from borgmatic/tests/integration/config/__init__.py rename to tests/integration/config/__init__.py diff --git a/borgmatic/tests/integration/config/test_generate.py b/tests/integration/config/test_generate.py similarity index 100% rename from borgmatic/tests/integration/config/test_generate.py rename to tests/integration/config/test_generate.py diff --git a/borgmatic/tests/integration/config/test_legacy.py b/tests/integration/config/test_legacy.py similarity index 100% rename from borgmatic/tests/integration/config/test_legacy.py rename to tests/integration/config/test_legacy.py diff --git a/borgmatic/tests/integration/config/test_validate.py b/tests/integration/config/test_validate.py similarity index 100% rename from borgmatic/tests/integration/config/test_validate.py rename to tests/integration/config/test_validate.py diff --git a/borgmatic/tests/integration/test_version.py b/tests/integration/test_version.py similarity index 100% rename from borgmatic/tests/integration/test_version.py rename to tests/integration/test_version.py diff --git a/borgmatic/tests/unit/__init__.py b/tests/unit/__init__.py similarity index 100% rename from borgmatic/tests/unit/__init__.py rename to tests/unit/__init__.py diff --git a/borgmatic/tests/unit/borg/__init__.py b/tests/unit/borg/__init__.py similarity index 100% rename from borgmatic/tests/unit/borg/__init__.py rename to tests/unit/borg/__init__.py diff --git a/borgmatic/tests/unit/borg/test_check.py b/tests/unit/borg/test_check.py similarity index 99% rename from borgmatic/tests/unit/borg/test_check.py rename to tests/unit/borg/test_check.py index 7218584..95b32c3 100644 --- a/borgmatic/tests/unit/borg/test_check.py +++ b/tests/unit/borg/test_check.py @@ -6,7 +6,7 @@ from flexmock import flexmock import pytest from borgmatic.borg import check as module -from borgmatic.tests.unit.test_verbosity import insert_logging_mock +from ..test_verbosity import insert_logging_mock def insert_subprocess_mock(check_call_command, **kwargs): diff --git a/borgmatic/tests/unit/borg/test_create.py b/tests/unit/borg/test_create.py similarity index 99% rename from borgmatic/tests/unit/borg/test_create.py rename to tests/unit/borg/test_create.py index 4318867..8b739b1 100644 --- a/borgmatic/tests/unit/borg/test_create.py +++ b/tests/unit/borg/test_create.py @@ -4,7 +4,7 @@ import os from flexmock import flexmock from borgmatic.borg import create as module -from borgmatic.tests.unit.test_verbosity import insert_logging_mock +from ..test_verbosity import insert_logging_mock def test_initialize_environment_with_passcommand_should_set_environment(): diff --git a/borgmatic/tests/unit/borg/test_extract.py b/tests/unit/borg/test_extract.py similarity index 98% rename from borgmatic/tests/unit/borg/test_extract.py rename to tests/unit/borg/test_extract.py index 6be2f5f..c970063 100644 --- a/borgmatic/tests/unit/borg/test_extract.py +++ b/tests/unit/borg/test_extract.py @@ -4,7 +4,7 @@ import sys from flexmock import flexmock from borgmatic.borg import extract as module -from borgmatic.tests.unit.test_verbosity import insert_logging_mock +from ..test_verbosity import insert_logging_mock def insert_subprocess_mock(check_call_command, **kwargs): diff --git a/borgmatic/tests/unit/borg/test_hook.py b/tests/unit/borg/test_hook.py similarity index 100% rename from borgmatic/tests/unit/borg/test_hook.py rename to tests/unit/borg/test_hook.py diff --git a/borgmatic/tests/unit/borg/test_info.py b/tests/unit/borg/test_info.py similarity index 96% rename from borgmatic/tests/unit/borg/test_info.py rename to tests/unit/borg/test_info.py index 440ecb2..7e79456 100644 --- a/borgmatic/tests/unit/borg/test_info.py +++ b/tests/unit/borg/test_info.py @@ -3,7 +3,7 @@ import logging from flexmock import flexmock from borgmatic.borg import info as module -from borgmatic.tests.unit.test_verbosity import insert_logging_mock +from ..test_verbosity import insert_logging_mock def insert_subprocess_mock(check_call_command, **kwargs): diff --git a/borgmatic/tests/unit/borg/test_list.py b/tests/unit/borg/test_list.py similarity index 96% rename from borgmatic/tests/unit/borg/test_list.py rename to tests/unit/borg/test_list.py index 2e72747..94dae2d 100644 --- a/borgmatic/tests/unit/borg/test_list.py +++ b/tests/unit/borg/test_list.py @@ -3,7 +3,7 @@ import logging from flexmock import flexmock from borgmatic.borg import list as module -from borgmatic.tests.unit.test_verbosity import insert_logging_mock +from ..test_verbosity import insert_logging_mock def insert_subprocess_mock(check_call_command, **kwargs): diff --git a/borgmatic/tests/unit/borg/test_prune.py b/tests/unit/borg/test_prune.py similarity index 98% rename from borgmatic/tests/unit/borg/test_prune.py rename to tests/unit/borg/test_prune.py index fda2574..6f82d28 100644 --- a/borgmatic/tests/unit/borg/test_prune.py +++ b/tests/unit/borg/test_prune.py @@ -4,7 +4,7 @@ from collections import OrderedDict from flexmock import flexmock from borgmatic.borg import prune as module -from borgmatic.tests.unit.test_verbosity import insert_logging_mock +from ..test_verbosity import insert_logging_mock def insert_subprocess_mock(check_call_command, **kwargs): diff --git a/borgmatic/tests/unit/commands/__init__.py b/tests/unit/commands/__init__.py similarity index 100% rename from borgmatic/tests/unit/commands/__init__.py rename to tests/unit/commands/__init__.py diff --git a/borgmatic/tests/unit/commands/test_borgmatic.py b/tests/unit/commands/test_borgmatic.py similarity index 100% rename from borgmatic/tests/unit/commands/test_borgmatic.py rename to tests/unit/commands/test_borgmatic.py diff --git a/borgmatic/tests/unit/config/__init__.py b/tests/unit/config/__init__.py similarity index 100% rename from borgmatic/tests/unit/config/__init__.py rename to tests/unit/config/__init__.py diff --git a/borgmatic/tests/unit/config/test_collect.py b/tests/unit/config/test_collect.py similarity index 100% rename from borgmatic/tests/unit/config/test_collect.py rename to tests/unit/config/test_collect.py diff --git a/borgmatic/tests/unit/config/test_convert.py b/tests/unit/config/test_convert.py similarity index 100% rename from borgmatic/tests/unit/config/test_convert.py rename to tests/unit/config/test_convert.py diff --git a/borgmatic/tests/unit/config/test_generate.py b/tests/unit/config/test_generate.py similarity index 100% rename from borgmatic/tests/unit/config/test_generate.py rename to tests/unit/config/test_generate.py diff --git a/borgmatic/tests/unit/config/test_legacy.py b/tests/unit/config/test_legacy.py similarity index 100% rename from borgmatic/tests/unit/config/test_legacy.py rename to tests/unit/config/test_legacy.py diff --git a/borgmatic/tests/unit/config/test_validate.py b/tests/unit/config/test_validate.py similarity index 100% rename from borgmatic/tests/unit/config/test_validate.py rename to tests/unit/config/test_validate.py diff --git a/borgmatic/tests/unit/test_verbosity.py b/tests/unit/test_verbosity.py similarity index 100% rename from borgmatic/tests/unit/test_verbosity.py rename to tests/unit/test_verbosity.py diff --git a/tox.ini b/tox.ini index b1521a2..558911e 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ skipsdist=True usedevelop=True deps=-rtest_requirements.txt commands = - py.test --cov-report term-missing:skip-covered --cov=borgmatic borgmatic [] + py.test --cov-report term-missing:skip-covered --cov=borgmatic tests [] black --skip-string-normalization --line-length 100 --check . flake8 .