From: Christian Herdtweck <christian.herdtweck@intra2net.com>
Date: Wed, 6 Dec 2017 12:14:51 +0000 (+0100)
Subject: Make sure unittests only import from src
X-Git-Tag: v1.2~8
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=be912caa635355c153df07b9780c5f90a6eb86fd;p=pyi2ncommon

Make sure unittests only import from src

Before, the imports could have been from an earlier installed version of
pyi2ncommon.
---

diff --git a/test/template.py b/test/template.py
index ff5effb..fb85c91 100644
--- a/test/template.py
+++ b/test/template.py
@@ -28,10 +28,12 @@ For help see :py:mod:`unittest`
 """
 
 from __future__ import print_function
+from __future__ import absolute_import
 
 import unittest
 
-import module_name
+# relative import of tested module ensures we do not test installed version
+from src import module_name
 
 
 def setUpModule():
diff --git a/test/test_buffer.py b/test/test_buffer.py
index 46ae115..0f58129 100644
--- a/test/test_buffer.py
+++ b/test/test_buffer.py
@@ -27,10 +27,12 @@ For help see :py:mod:`unittest`
 .. codeauthor:: Intra2net
 """
 
+from __future__ import absolute_import
+
 import unittest
 from math import log, floor
 
-import buffers
+from src import buffers
 
 
 class CircBufferTester(unittest.TestCase):
diff --git a/test/test_call_helpers.py b/test/test_call_helpers.py
index e21b011..225755f 100644
--- a/test/test_call_helpers.py
+++ b/test/test_call_helpers.py
@@ -23,11 +23,13 @@ Should be run from python2 and python3!
 .. codeauthor:: Intra2net
 """
 
+from __future__ import absolute_import
+
 import unittest
 import os
 
-import call_helpers
-from type_helpers import is_unicode
+from src import call_helpers
+from src.type_helpers import is_unicode
 
 
 class CallHelperTester(unittest.TestCase):
diff --git a/test/test_file_helpers.py b/test/test_file_helpers.py
index c58a619..adf6ebd 100644
--- a/test/test_file_helpers.py
+++ b/test/test_file_helpers.py
@@ -27,11 +27,13 @@ For help see :py:mod:`unittest`
 .. codeauthor:: Intra2net
 """
 
+from __future__ import absolute_import
+
 import unittest
 
-import file_helpers
+from src import file_helpers
 
-from call_helpers import call_and_capture
+from src.call_helpers import call_and_capture
 import os
 
 
diff --git a/test/test_follow.py b/test/test_follow.py
index c2aabdf..cadb616 100644
--- a/test/test_follow.py
+++ b/test/test_follow.py
@@ -29,15 +29,16 @@ thread that writes to file/socket/stdout
 .. codeauthor:: Intra2net
 """
 
+from __future__ import absolute_import
 
 import unittest
 from tempfile import mkstemp
 import threading
-from follow import *
+from src.follow import *
 from time import sleep
 import os
 import os.path
-from test_helpers import get_perf_counter
+from src.test_helpers import get_perf_counter
 
 # different counter needed on different python versions
 perf_counter = get_perf_counter()
diff --git a/test/test_log_read.py b/test/test_log_read.py
index 7930b06..d1db6d6 100644
--- a/test/test_log_read.py
+++ b/test/test_log_read.py
@@ -23,17 +23,19 @@ Creates own thread to write data to a log file
 .. codeauthor:: Intra2net
 """
 
+from __future__ import absolute_import
+
 import unittest
 from threading import Thread
 from tempfile import mkstemp
 import os
 import time
 import logging
-from test_helpers import get_perf_counter
+from src.test_helpers import get_perf_counter
 
 perf_counter = get_perf_counter()
 
-from log_read import IterativeReader, LineReader
+from src.log_read import IterativeReader, LineReader
 
 
 class LogFileWriter(Thread):
diff --git a/test/test_test_helper.py b/test/test_test_helper.py
index 0fcd2d6..9d5f7ab 100644
--- a/test/test_test_helper.py
+++ b/test/test_test_helper.py
@@ -27,16 +27,19 @@ For help see :py:mod:`unittest`
 .. codeauthor:: Intra2net
 """
 
+# TODO: remove print, use logging instead
 from __future__ import print_function
 
+from __future__ import absolute_import
+
 import unittest
 from datetime import timedelta, datetime as dt
-from file_helpers import FilesystemFillState, get_filesystem_fill_states
+from src.file_helpers import FilesystemFillState, get_filesystem_fill_states
 import warnings
 from time import sleep
 import threading
 
-import test_helpers
+from src import test_helpers
 
 
 class TestHelperTester(unittest.TestCase):
diff --git a/test/test_text_helpers.py b/test/test_text_helpers.py
index 0b618ad..a40c55d 100644
--- a/test/test_text_helpers.py
+++ b/test/test_text_helpers.py
@@ -27,11 +27,11 @@ For help see :py:mod:`unittest`
 .. codeauthor:: Intra2net
 """
 
-from __future__ import print_function
+from __future__ import absolute_import
 
 import unittest
 
-from text_helpers import *
+from src.text_helpers import *
 
 
 class TextHelpersTester(unittest.TestCase):
diff --git a/test/test_type_helpers.py b/test/test_type_helpers.py
index 82ccfed..97785dd 100644
--- a/test/test_type_helpers.py
+++ b/test/test_type_helpers.py
@@ -27,9 +27,11 @@ For help see :py:mod:`unittest`
 .. codeauthor:: Intra2net
 """
 
+from __future__ import absolute_import
+
 import unittest
 
-from type_helpers import is_unicode, isstr
+from src.type_helpers import is_unicode, isstr
 from sys import version_info