[tor-commits] [bridgedb/master] Move tests back into bridgedb directory to fix `python setup.py test`.

isis at torproject.org isis at torproject.org
Sat Oct 28 00:29:39 UTC 2017


commit 31f6e514fd4bb647939c222b143c097ee24fa6d3
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Jul 25 20:47:23 2017 +0000

    Move tests back into bridgedb directory to fix `python setup.py test`.
    
     * FIXES #23034.
---
 Makefile                                              | 2 +-
 {test => bridgedb/test}/README                        | 0
 {test => bridgedb/test}/__init__.py                   | 0
 {test => bridgedb/test}/deprecated.py                 | 0
 {test => bridgedb/test}/email_helpers.py              | 0
 {test => bridgedb/test}/https_helpers.py              | 0
 {test => bridgedb/test}/legacy_Tests.py               | 0
 {test => bridgedb/test}/test_Bucket.py                | 0
 {test => bridgedb/test}/test_Main.py                  | 0
 {test => bridgedb/test}/test_Storage.py               | 0
 {test => bridgedb/test}/test_Tests.py                 | 0
 {test => bridgedb/test}/test_bridgedb.py              | 0
 {test => bridgedb/test}/test_bridgerequest.py         | 0
 {test => bridgedb/test}/test_bridges.py               | 0
 {test => bridgedb/test}/test_captcha.py               | 0
 {test => bridgedb/test}/test_configure.py             | 0
 {test => bridgedb/test}/test_crypto.py                | 0
 {test => bridgedb/test}/test_distribute.py            | 0
 {test => bridgedb/test}/test_email_autoresponder.py   | 0
 {test => bridgedb/test}/test_email_distributor.py     | 0
 {test => bridgedb/test}/test_email_dkim.py            | 0
 {test => bridgedb/test}/test_email_request.py         | 0
 {test => bridgedb/test}/test_email_server.py          | 0
 {test => bridgedb/test}/test_email_templates.py       | 0
 {test => bridgedb/test}/test_filters.py               | 0
 {test => bridgedb/test}/test_geo.py                   | 0
 {test => bridgedb/test}/test_https.py                 | 0
 {test => bridgedb/test}/test_https_distributor.py     | 0
 {test => bridgedb/test}/test_https_request.py         | 0
 {test => bridgedb/test}/test_https_server.py          | 0
 {test => bridgedb/test}/test_interfaces.py            | 0
 {test => bridgedb/test}/test_parse_addr.py            | 0
 {test => bridgedb/test}/test_parse_descriptors.py     | 0
 {test => bridgedb/test}/test_parse_headers.py         | 0
 {test => bridgedb/test}/test_parse_nickname.py        | 0
 {test => bridgedb/test}/test_parse_options.py         | 0
 {test => bridgedb/test}/test_parse_versions.py        | 0
 {test => bridgedb/test}/test_persistent.py            | 0
 {test => bridgedb/test}/test_persistentSaveAndLoad.py | 0
 {test => bridgedb/test}/test_proxy.py                 | 0
 {test => bridgedb/test}/test_qrcodes.py               | 0
 {test => bridgedb/test}/test_safelog.py               | 0
 {test => bridgedb/test}/test_schedule.py              | 0
 {test => bridgedb/test}/test_smtp.py                  | 0
 {test => bridgedb/test}/test_translations.py          | 0
 {test => bridgedb/test}/test_txrecaptcha.py           | 0
 {test => bridgedb/test}/test_util.py                  | 0
 {test => bridgedb/test}/util.py                       | 0
 setup.py                                              | 4 +++-
 49 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 8aa92a3..906ce94 100644
--- a/Makefile
+++ b/Makefile
@@ -73,7 +73,7 @@ ifeq ($(PYTHON_IMPLEMENTATION),PyPy)
 	@echo "Detected PyPy... not running coverage."
 	python setup.py test
 else
-	coverage run --rcfile=".coveragerc" $(TRIAL) ./test/test_*.py
+	coverage run --rcfile=".coveragerc" $(TRIAL) ./bridgedb/test/test_*.py
 	coverage report --rcfile=".coveragerc"
 endif
 
diff --git a/test/README b/bridgedb/test/README
similarity index 100%
rename from test/README
rename to bridgedb/test/README
diff --git a/test/__init__.py b/bridgedb/test/__init__.py
similarity index 100%
rename from test/__init__.py
rename to bridgedb/test/__init__.py
diff --git a/test/deprecated.py b/bridgedb/test/deprecated.py
similarity index 100%
rename from test/deprecated.py
rename to bridgedb/test/deprecated.py
diff --git a/test/email_helpers.py b/bridgedb/test/email_helpers.py
similarity index 100%
rename from test/email_helpers.py
rename to bridgedb/test/email_helpers.py
diff --git a/test/https_helpers.py b/bridgedb/test/https_helpers.py
similarity index 100%
rename from test/https_helpers.py
rename to bridgedb/test/https_helpers.py
diff --git a/test/legacy_Tests.py b/bridgedb/test/legacy_Tests.py
similarity index 100%
rename from test/legacy_Tests.py
rename to bridgedb/test/legacy_Tests.py
diff --git a/test/test_Bucket.py b/bridgedb/test/test_Bucket.py
similarity index 100%
rename from test/test_Bucket.py
rename to bridgedb/test/test_Bucket.py
diff --git a/test/test_Main.py b/bridgedb/test/test_Main.py
similarity index 100%
rename from test/test_Main.py
rename to bridgedb/test/test_Main.py
diff --git a/test/test_Storage.py b/bridgedb/test/test_Storage.py
similarity index 100%
rename from test/test_Storage.py
rename to bridgedb/test/test_Storage.py
diff --git a/test/test_Tests.py b/bridgedb/test/test_Tests.py
similarity index 100%
rename from test/test_Tests.py
rename to bridgedb/test/test_Tests.py
diff --git a/test/test_bridgedb.py b/bridgedb/test/test_bridgedb.py
similarity index 100%
rename from test/test_bridgedb.py
rename to bridgedb/test/test_bridgedb.py
diff --git a/test/test_bridgerequest.py b/bridgedb/test/test_bridgerequest.py
similarity index 100%
rename from test/test_bridgerequest.py
rename to bridgedb/test/test_bridgerequest.py
diff --git a/test/test_bridges.py b/bridgedb/test/test_bridges.py
similarity index 100%
rename from test/test_bridges.py
rename to bridgedb/test/test_bridges.py
diff --git a/test/test_captcha.py b/bridgedb/test/test_captcha.py
similarity index 100%
rename from test/test_captcha.py
rename to bridgedb/test/test_captcha.py
diff --git a/test/test_configure.py b/bridgedb/test/test_configure.py
similarity index 100%
rename from test/test_configure.py
rename to bridgedb/test/test_configure.py
diff --git a/test/test_crypto.py b/bridgedb/test/test_crypto.py
similarity index 100%
rename from test/test_crypto.py
rename to bridgedb/test/test_crypto.py
diff --git a/test/test_distribute.py b/bridgedb/test/test_distribute.py
similarity index 100%
rename from test/test_distribute.py
rename to bridgedb/test/test_distribute.py
diff --git a/test/test_email_autoresponder.py b/bridgedb/test/test_email_autoresponder.py
similarity index 100%
rename from test/test_email_autoresponder.py
rename to bridgedb/test/test_email_autoresponder.py
diff --git a/test/test_email_distributor.py b/bridgedb/test/test_email_distributor.py
similarity index 100%
rename from test/test_email_distributor.py
rename to bridgedb/test/test_email_distributor.py
diff --git a/test/test_email_dkim.py b/bridgedb/test/test_email_dkim.py
similarity index 100%
rename from test/test_email_dkim.py
rename to bridgedb/test/test_email_dkim.py
diff --git a/test/test_email_request.py b/bridgedb/test/test_email_request.py
similarity index 100%
rename from test/test_email_request.py
rename to bridgedb/test/test_email_request.py
diff --git a/test/test_email_server.py b/bridgedb/test/test_email_server.py
similarity index 100%
rename from test/test_email_server.py
rename to bridgedb/test/test_email_server.py
diff --git a/test/test_email_templates.py b/bridgedb/test/test_email_templates.py
similarity index 100%
rename from test/test_email_templates.py
rename to bridgedb/test/test_email_templates.py
diff --git a/test/test_filters.py b/bridgedb/test/test_filters.py
similarity index 100%
rename from test/test_filters.py
rename to bridgedb/test/test_filters.py
diff --git a/test/test_geo.py b/bridgedb/test/test_geo.py
similarity index 100%
rename from test/test_geo.py
rename to bridgedb/test/test_geo.py
diff --git a/test/test_https.py b/bridgedb/test/test_https.py
similarity index 100%
rename from test/test_https.py
rename to bridgedb/test/test_https.py
diff --git a/test/test_https_distributor.py b/bridgedb/test/test_https_distributor.py
similarity index 100%
rename from test/test_https_distributor.py
rename to bridgedb/test/test_https_distributor.py
diff --git a/test/test_https_request.py b/bridgedb/test/test_https_request.py
similarity index 100%
rename from test/test_https_request.py
rename to bridgedb/test/test_https_request.py
diff --git a/test/test_https_server.py b/bridgedb/test/test_https_server.py
similarity index 100%
rename from test/test_https_server.py
rename to bridgedb/test/test_https_server.py
diff --git a/test/test_interfaces.py b/bridgedb/test/test_interfaces.py
similarity index 100%
rename from test/test_interfaces.py
rename to bridgedb/test/test_interfaces.py
diff --git a/test/test_parse_addr.py b/bridgedb/test/test_parse_addr.py
similarity index 100%
rename from test/test_parse_addr.py
rename to bridgedb/test/test_parse_addr.py
diff --git a/test/test_parse_descriptors.py b/bridgedb/test/test_parse_descriptors.py
similarity index 100%
rename from test/test_parse_descriptors.py
rename to bridgedb/test/test_parse_descriptors.py
diff --git a/test/test_parse_headers.py b/bridgedb/test/test_parse_headers.py
similarity index 100%
rename from test/test_parse_headers.py
rename to bridgedb/test/test_parse_headers.py
diff --git a/test/test_parse_nickname.py b/bridgedb/test/test_parse_nickname.py
similarity index 100%
rename from test/test_parse_nickname.py
rename to bridgedb/test/test_parse_nickname.py
diff --git a/test/test_parse_options.py b/bridgedb/test/test_parse_options.py
similarity index 100%
rename from test/test_parse_options.py
rename to bridgedb/test/test_parse_options.py
diff --git a/test/test_parse_versions.py b/bridgedb/test/test_parse_versions.py
similarity index 100%
rename from test/test_parse_versions.py
rename to bridgedb/test/test_parse_versions.py
diff --git a/test/test_persistent.py b/bridgedb/test/test_persistent.py
similarity index 100%
rename from test/test_persistent.py
rename to bridgedb/test/test_persistent.py
diff --git a/test/test_persistentSaveAndLoad.py b/bridgedb/test/test_persistentSaveAndLoad.py
similarity index 100%
rename from test/test_persistentSaveAndLoad.py
rename to bridgedb/test/test_persistentSaveAndLoad.py
diff --git a/test/test_proxy.py b/bridgedb/test/test_proxy.py
similarity index 100%
rename from test/test_proxy.py
rename to bridgedb/test/test_proxy.py
diff --git a/test/test_qrcodes.py b/bridgedb/test/test_qrcodes.py
similarity index 100%
rename from test/test_qrcodes.py
rename to bridgedb/test/test_qrcodes.py
diff --git a/test/test_safelog.py b/bridgedb/test/test_safelog.py
similarity index 100%
rename from test/test_safelog.py
rename to bridgedb/test/test_safelog.py
diff --git a/test/test_schedule.py b/bridgedb/test/test_schedule.py
similarity index 100%
rename from test/test_schedule.py
rename to bridgedb/test/test_schedule.py
diff --git a/test/test_smtp.py b/bridgedb/test/test_smtp.py
similarity index 100%
rename from test/test_smtp.py
rename to bridgedb/test/test_smtp.py
diff --git a/test/test_translations.py b/bridgedb/test/test_translations.py
similarity index 100%
rename from test/test_translations.py
rename to bridgedb/test/test_translations.py
diff --git a/test/test_txrecaptcha.py b/bridgedb/test/test_txrecaptcha.py
similarity index 100%
rename from test/test_txrecaptcha.py
rename to bridgedb/test/test_txrecaptcha.py
diff --git a/test/test_util.py b/bridgedb/test/test_util.py
similarity index 100%
rename from test/test_util.py
rename to bridgedb/test/test_util.py
diff --git a/test/util.py b/bridgedb/test/util.py
similarity index 100%
rename from test/util.py
rename to bridgedb/test/util.py
diff --git a/setup.py b/setup.py
index 97dee01..955a720 100644
--- a/setup.py
+++ b/setup.py
@@ -377,7 +377,9 @@ setuptools.setup(
     packages=['bridgedb',
               'bridgedb.email',
               'bridgedb.https',
-              'bridgedb.parse'],
+              'bridgedb.parse',
+              'bridgedb.test',
+          ],
     scripts=['scripts/bridgedb',
              'scripts/get-tor-exits'],
     extras_require={'test': ["sure==1.2.2",





More information about the tor-commits mailing list