From ecf161e517efce53493ef4ce341cef0f3ad6b24d Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 14 Jan 2020 14:58:01 +0100
Subject: [PATCH] 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.
---
 src/libcharon/plugins/vici/python/MANIFEST.in                 | 2 ++
 src/libcharon/plugins/vici/python/Makefile.am                 | 4 ++--
 src/libcharon/plugins/vici/python/{vici => }/test/__init__.py | 0
 .../plugins/vici/python/{vici => }/test/test_protocol.py      | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)
 rename src/libcharon/plugins/vici/python/{vici => }/test/__init__.py (100%)
 rename src/libcharon/plugins/vici/python/{vici => }/test/test_protocol.py (98%)

diff --git a/src/libcharon/plugins/vici/python/MANIFEST.in b/src/libcharon/plugins/vici/python/MANIFEST.in
index 9d5d250d0..883ea5d52 100644
--- 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 8a9e6fc26..a2e7596e4 100644
--- 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 7ae1f2f90..1924884a1 100644
--- 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):