From 75e9d03d70485e3e1c00eb78df841e75861635b1 Mon Sep 17 00:00:00 2001 From: Salad Dais Date: Sat, 1 May 2021 00:16:01 +0000 Subject: [PATCH] Move tests out of the package This will help us get better coverage info, and prevent packaging test data with the sdist. --- MANIFEST.in | 1 - hippolyzer/lib/base/tests/__init__.py | 20 ------------------ {hippolyzer/apps/tests => tests}/__init__.py | 0 .../proxy/tests => tests/apps}/__init__.py | 0 .../apps}/test_message_filter.py | 0 .../message/tests => tests/base}/__init__.py | 0 .../tests => tests/base}/test_datatypes.py | 0 .../tests => tests/base}/test_legacy_inv.py | 0 .../base}/test_llsd_serializer.py | 0 .../base/tests => tests/base}/test_mesh.py | 2 +- .../base}/test_message_dot_xml.py | 0 .../base}/test_message_wrapper.py | 0 .../tests => tests/base}/test_multidict.py | 0 .../tests => tests/base}/test_packetdata.py | 0 .../base}/test_resources/testslm.slm | Bin .../base}/test_serialization.py | 0 .../tests => tests/base}/test_settings.py | 0 .../base}/test_template_parser.py | 0 .../base}/test_udp_deserializer.py | 0 .../base}/test_udp_serializer.py | 0 tests/proxy/__init__.py | 0 .../proxy}/integration/__init__.py | 0 .../proxy}/integration/test_addons.py | 3 ++- .../proxy}/integration/test_lludp.py | 3 ++- .../tests => tests/proxy}/test_commands.py | 0 .../tests => tests/proxy}/test_messages.py | 0 .../proxy}/test_object_manager.py | 0 .../tests => tests/proxy}/test_templates.py | 0 .../proxy/tests => tests/proxy}/test_vfs.py | 0 29 files changed, 5 insertions(+), 24 deletions(-) delete mode 100644 MANIFEST.in delete mode 100644 hippolyzer/lib/base/tests/__init__.py rename {hippolyzer/apps/tests => tests}/__init__.py (100%) rename {hippolyzer/lib/proxy/tests => tests/apps}/__init__.py (100%) rename {hippolyzer/apps/tests => tests/apps}/test_message_filter.py (100%) rename {hippolyzer/lib/base/message/tests => tests/base}/__init__.py (100%) rename {hippolyzer/lib/base/tests => tests/base}/test_datatypes.py (100%) rename {hippolyzer/lib/base/tests => tests/base}/test_legacy_inv.py (100%) rename {hippolyzer/lib/base/message/tests => tests/base}/test_llsd_serializer.py (100%) rename {hippolyzer/lib/base/tests => tests/base}/test_mesh.py (95%) rename {hippolyzer/lib/base/message/tests => tests/base}/test_message_dot_xml.py (100%) rename {hippolyzer/lib/base/message/tests => tests/base}/test_message_wrapper.py (100%) rename {hippolyzer/lib/base/tests => tests/base}/test_multidict.py (100%) rename {hippolyzer/lib/base/message/tests => tests/base}/test_packetdata.py (100%) rename {hippolyzer/lib/base/tests => tests/base}/test_resources/testslm.slm (100%) rename {hippolyzer/lib/base/tests => tests/base}/test_serialization.py (100%) rename {hippolyzer/lib/base/tests => tests/base}/test_settings.py (100%) rename {hippolyzer/lib/base/message/tests => tests/base}/test_template_parser.py (100%) rename {hippolyzer/lib/base/message/tests => tests/base}/test_udp_deserializer.py (100%) rename {hippolyzer/lib/base/message/tests => tests/base}/test_udp_serializer.py (100%) create mode 100644 tests/proxy/__init__.py rename {hippolyzer/lib/proxy/tests => tests/proxy}/integration/__init__.py (100%) rename {hippolyzer/lib/proxy/tests => tests/proxy}/integration/test_addons.py (97%) rename {hippolyzer/lib/proxy/tests => tests/proxy}/integration/test_lludp.py (99%) rename {hippolyzer/lib/proxy/tests => tests/proxy}/test_commands.py (100%) rename {hippolyzer/lib/proxy/tests => tests/proxy}/test_messages.py (100%) rename {hippolyzer/lib/proxy/tests => tests/proxy}/test_object_manager.py (100%) rename {hippolyzer/lib/proxy/tests => tests/proxy}/test_templates.py (100%) rename {hippolyzer/lib/proxy/tests => tests/proxy}/test_vfs.py (100%) diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index 2c0b7b5..0000000 --- a/MANIFEST.in +++ /dev/null @@ -1 +0,0 @@ -exclude-global *tests* \ No newline at end of file diff --git a/hippolyzer/lib/base/tests/__init__.py b/hippolyzer/lib/base/tests/__init__.py deleted file mode 100644 index 3f925e0..0000000 --- a/hippolyzer/lib/base/tests/__init__.py +++ /dev/null @@ -1,20 +0,0 @@ -""" -Copyright 2009, Linden Research, Inc. - See NOTICE.md for previous contributors -Copyright 2021, Salad Dais -All Rights Reserved. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 3 of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public License -along with this program; if not, write to the Free Software Foundation, -Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -""" diff --git a/hippolyzer/apps/tests/__init__.py b/tests/__init__.py similarity index 100% rename from hippolyzer/apps/tests/__init__.py rename to tests/__init__.py diff --git a/hippolyzer/lib/proxy/tests/__init__.py b/tests/apps/__init__.py similarity index 100% rename from hippolyzer/lib/proxy/tests/__init__.py rename to tests/apps/__init__.py diff --git a/hippolyzer/apps/tests/test_message_filter.py b/tests/apps/test_message_filter.py similarity index 100% rename from hippolyzer/apps/tests/test_message_filter.py rename to tests/apps/test_message_filter.py diff --git a/hippolyzer/lib/base/message/tests/__init__.py b/tests/base/__init__.py similarity index 100% rename from hippolyzer/lib/base/message/tests/__init__.py rename to tests/base/__init__.py diff --git a/hippolyzer/lib/base/tests/test_datatypes.py b/tests/base/test_datatypes.py similarity index 100% rename from hippolyzer/lib/base/tests/test_datatypes.py rename to tests/base/test_datatypes.py diff --git a/hippolyzer/lib/base/tests/test_legacy_inv.py b/tests/base/test_legacy_inv.py similarity index 100% rename from hippolyzer/lib/base/tests/test_legacy_inv.py rename to tests/base/test_legacy_inv.py diff --git a/hippolyzer/lib/base/message/tests/test_llsd_serializer.py b/tests/base/test_llsd_serializer.py similarity index 100% rename from hippolyzer/lib/base/message/tests/test_llsd_serializer.py rename to tests/base/test_llsd_serializer.py diff --git a/hippolyzer/lib/base/tests/test_mesh.py b/tests/base/test_mesh.py similarity index 95% rename from hippolyzer/lib/base/tests/test_mesh.py rename to tests/base/test_mesh.py index c6fd6d2..bd5232a 100644 --- a/hippolyzer/lib/base/tests/test_mesh.py +++ b/tests/base/test_mesh.py @@ -10,7 +10,7 @@ class TestMesh(unittest.TestCase): @classmethod def setUpClass(cls) -> None: # Use a rigged cube SLM from the upload process as a test file - slm_file = pkg_resources.resource_filename("hippolyzer.lib.base", "tests/test_resources/testslm.slm") + slm_file = pkg_resources.resource_filename(__name__, "test_resources/testslm.slm") with open(slm_file, "rb") as f: cls.slm_bytes = f.read() diff --git a/hippolyzer/lib/base/message/tests/test_message_dot_xml.py b/tests/base/test_message_dot_xml.py similarity index 100% rename from hippolyzer/lib/base/message/tests/test_message_dot_xml.py rename to tests/base/test_message_dot_xml.py diff --git a/hippolyzer/lib/base/message/tests/test_message_wrapper.py b/tests/base/test_message_wrapper.py similarity index 100% rename from hippolyzer/lib/base/message/tests/test_message_wrapper.py rename to tests/base/test_message_wrapper.py diff --git a/hippolyzer/lib/base/tests/test_multidict.py b/tests/base/test_multidict.py similarity index 100% rename from hippolyzer/lib/base/tests/test_multidict.py rename to tests/base/test_multidict.py diff --git a/hippolyzer/lib/base/message/tests/test_packetdata.py b/tests/base/test_packetdata.py similarity index 100% rename from hippolyzer/lib/base/message/tests/test_packetdata.py rename to tests/base/test_packetdata.py diff --git a/hippolyzer/lib/base/tests/test_resources/testslm.slm b/tests/base/test_resources/testslm.slm similarity index 100% rename from hippolyzer/lib/base/tests/test_resources/testslm.slm rename to tests/base/test_resources/testslm.slm diff --git a/hippolyzer/lib/base/tests/test_serialization.py b/tests/base/test_serialization.py similarity index 100% rename from hippolyzer/lib/base/tests/test_serialization.py rename to tests/base/test_serialization.py diff --git a/hippolyzer/lib/base/tests/test_settings.py b/tests/base/test_settings.py similarity index 100% rename from hippolyzer/lib/base/tests/test_settings.py rename to tests/base/test_settings.py diff --git a/hippolyzer/lib/base/message/tests/test_template_parser.py b/tests/base/test_template_parser.py similarity index 100% rename from hippolyzer/lib/base/message/tests/test_template_parser.py rename to tests/base/test_template_parser.py diff --git a/hippolyzer/lib/base/message/tests/test_udp_deserializer.py b/tests/base/test_udp_deserializer.py similarity index 100% rename from hippolyzer/lib/base/message/tests/test_udp_deserializer.py rename to tests/base/test_udp_deserializer.py diff --git a/hippolyzer/lib/base/message/tests/test_udp_serializer.py b/tests/base/test_udp_serializer.py similarity index 100% rename from hippolyzer/lib/base/message/tests/test_udp_serializer.py rename to tests/base/test_udp_serializer.py diff --git a/tests/proxy/__init__.py b/tests/proxy/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/hippolyzer/lib/proxy/tests/integration/__init__.py b/tests/proxy/integration/__init__.py similarity index 100% rename from hippolyzer/lib/proxy/tests/integration/__init__.py rename to tests/proxy/integration/__init__.py diff --git a/hippolyzer/lib/proxy/tests/integration/test_addons.py b/tests/proxy/integration/test_addons.py similarity index 97% rename from hippolyzer/lib/proxy/tests/integration/test_addons.py rename to tests/proxy/integration/test_addons.py index aa4ce22..7df815e 100644 --- a/hippolyzer/lib/proxy/tests/integration/test_addons.py +++ b/tests/proxy/integration/test_addons.py @@ -14,7 +14,8 @@ from hippolyzer.lib.proxy.message import ProxiedMessage from hippolyzer.lib.proxy.packets import Direction from hippolyzer.lib.proxy.region import ProxiedRegion from hippolyzer.lib.proxy.sessions import Session -from hippolyzer.lib.proxy.tests.integration import BaseIntegrationTest + +from . import BaseIntegrationTest class MockAddon(BaseAddon): diff --git a/hippolyzer/lib/proxy/tests/integration/test_lludp.py b/tests/proxy/integration/test_lludp.py similarity index 99% rename from hippolyzer/lib/proxy/tests/integration/test_lludp.py rename to tests/proxy/integration/test_lludp.py index 0804b00..1297a3b 100644 --- a/hippolyzer/lib/proxy/tests/integration/test_lludp.py +++ b/tests/proxy/integration/test_lludp.py @@ -16,7 +16,8 @@ from hippolyzer.lib.proxy.message import ProxiedMessage from hippolyzer.lib.proxy.packets import ProxiedUDPPacket, Direction from hippolyzer.lib.proxy.region import ProxiedRegion from hippolyzer.lib.proxy.sessions import Session -from hippolyzer.lib.proxy.tests.integration import BaseIntegrationTest + +from . import BaseIntegrationTest class MockAddon(BaseAddon): diff --git a/hippolyzer/lib/proxy/tests/test_commands.py b/tests/proxy/test_commands.py similarity index 100% rename from hippolyzer/lib/proxy/tests/test_commands.py rename to tests/proxy/test_commands.py diff --git a/hippolyzer/lib/proxy/tests/test_messages.py b/tests/proxy/test_messages.py similarity index 100% rename from hippolyzer/lib/proxy/tests/test_messages.py rename to tests/proxy/test_messages.py diff --git a/hippolyzer/lib/proxy/tests/test_object_manager.py b/tests/proxy/test_object_manager.py similarity index 100% rename from hippolyzer/lib/proxy/tests/test_object_manager.py rename to tests/proxy/test_object_manager.py diff --git a/hippolyzer/lib/proxy/tests/test_templates.py b/tests/proxy/test_templates.py similarity index 100% rename from hippolyzer/lib/proxy/tests/test_templates.py rename to tests/proxy/test_templates.py diff --git a/hippolyzer/lib/proxy/tests/test_vfs.py b/tests/proxy/test_vfs.py similarity index 100% rename from hippolyzer/lib/proxy/tests/test_vfs.py rename to tests/proxy/test_vfs.py