summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/util/tests
diff options
context:
space:
mode:
Diffstat (limited to 'src/leap/bitmask/util/tests')
-rw-r--r--src/leap/bitmask/util/tests/test_is_release_version.py4
-rw-r--r--src/leap/bitmask/util/tests/test_leap_log_handler.py10
-rw-r--r--src/leap/bitmask/util/tests/test_streamtologger.py2
3 files changed, 9 insertions, 7 deletions
diff --git a/src/leap/bitmask/util/tests/test_is_release_version.py b/src/leap/bitmask/util/tests/test_is_release_version.py
index 4199f603..088ec66d 100644
--- a/src/leap/bitmask/util/tests/test_is_release_version.py
+++ b/src/leap/bitmask/util/tests/test_is_release_version.py
@@ -17,10 +17,10 @@
"""
tests for _is_release_version function
"""
-
import unittest
+
+from leap.bitmask.util import _is_release_version as is_release_version
from leap.common.testing.basetest import BaseLeapTest
-from leap.util import _is_release_version as is_release_version
class TestIsReleaseVersion(BaseLeapTest):
diff --git a/src/leap/bitmask/util/tests/test_leap_log_handler.py b/src/leap/bitmask/util/tests/test_leap_log_handler.py
index ea509ea8..518fd35b 100644
--- a/src/leap/bitmask/util/tests/test_leap_log_handler.py
+++ b/src/leap/bitmask/util/tests/test_leap_log_handler.py
@@ -17,14 +17,16 @@
"""
tests for leap_log_handler
"""
-
-import unittest
+try:
+ import unittest2 as unittest
+except ImportError:
+ import unittest
import logging
-from leap.util.leap_log_handler import LeapLogHandler
+from leap.bitmask.util.leap_log_handler import LeapLogHandler
+from leap.bitmask.util.pyside_tests_helper import BasicPySlotCase
from leap.common.testing.basetest import BaseLeapTest
-from leap.util.pyside_tests_helper import BasicPySlotCase
from mock import Mock
diff --git a/src/leap/bitmask/util/tests/test_streamtologger.py b/src/leap/bitmask/util/tests/test_streamtologger.py
index 4c98e562..c4e55b3a 100644
--- a/src/leap/bitmask/util/tests/test_streamtologger.py
+++ b/src/leap/bitmask/util/tests/test_streamtologger.py
@@ -26,7 +26,7 @@ except ImportError:
import logging
import sys
-from leap.util.streamtologger import StreamToLogger
+from leap.bitmask.util.streamtologger import StreamToLogger
from leap.common.testing.basetest import BaseLeapTest