vici: Move Python test dir and include it in sdist

This is the recommended location and import config as it allows running the
tests against installed versions of the package.  And while the test file
itself is automatically included in the source distribution this way, the
__init__.py file is not, so we still have to update MANIFEST.in.

diff --git a/src/libcharon/plugins/vici/python/MANIFEST.in b/src/libcharon/plugins/vici/python/MANIFEST.in
index 9d5d250d095009403f66851f48866f5cfe39703b..883ea5d521dd7162435b0d0df8bb7f32c853ab5f 100644 (file)
--- a/src/libcharon/plugins/vici/python/MANIFEST.in
+++ b/src/libcharon/plugins/vici/python/MANIFEST.in
@@ -1,2 +1,4 @@
 include LICENSE
 include README.rst
+include tox.ini
+recursive-include test *.py

diff --git a/src/libcharon/plugins/vici/python/Makefile.am b/src/libcharon/plugins/vici/python/Makefile.am
index 8a9e6fc263861bf397b868f5a0c9ae02ba3c9f42..a2e7596e48fbaf8a3412a5282a9b39d70332d5cf 100644 (file)
--- a/src/libcharon/plugins/vici/python/Makefile.am
+++ b/src/libcharon/plugins/vici/python/Makefile.am
@@ -2,8 +2,8 @@ EXTRA_DIST = LICENSE README.rst MANIFEST.in \
        setup.py.in \
        tox.ini \
        tox.sh \
-       vici/test/__init__.py \
-       vici/test/test_protocol.py \
+       test/__init__.py \
+       test/test_protocol.py \
        vici/__init__.py \
        vici/command_wrappers.py \
        vici/compat.py \

diff --git a/src/libcharon/plugins/vici/python/vici/test/__init__.py b/src/libcharon/plugins/vici/python/test/__init__.py
similarity index 100%
rename from src/libcharon/plugins/vici/python/vici/test/__init__.py
rename to src/libcharon/plugins/vici/python/test/__init__.py

diff --git a/src/libcharon/plugins/vici/python/vici/test/test_protocol.py b/src/libcharon/plugins/vici/python/test/test_protocol.py
similarity index 98%
rename from src/libcharon/plugins/vici/python/vici/test/test_protocol.py
rename to src/libcharon/plugins/vici/python/test/test_protocol.py
index 7ae1f2f905143c1735f11d5205e078e501d4a3e1..1924884a11d0ca498f10773e9ebf1a2ddb882c8a 100644 (file)
--- a/src/libcharon/plugins/vici/python/vici/test/test_protocol.py
+++ b/src/libcharon/plugins/vici/python/test/test_protocol.py
@@ -1,7 +1,7 @@
 import pytest
 
-from ..protocol import Packet, Message, FiniteStream
-from ..exception import DeserializationException
+from vici.protocol import Packet, Message, FiniteStream
+from vici.exception import DeserializationException
 
 
 class TestPacket(object):