summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/__init__.py20
-rw-r--r--tests/test_filter_processor.py2
-rw-r--r--tests/test_generic_processor.py3
-rw-r--r--tests/test_head_tracking.py2
-rw-r--r--tests/test_parser.py2
5 files changed, 13 insertions, 16 deletions
diff --git a/tests/__init__.py b/tests/__init__.py
index 549cf3e..dac7575 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -17,20 +17,18 @@
"""Tests for bzr-fastimport."""
-from bzrlib.tests.TestUtil import TestLoader, TestSuite
+from bzrlib.tests.TestUtil import TestLoader
def test_suite():
- module_names = ['bzrlib.plugins.fastimport.' + x for x in [
- 'fastimport.tests.test_commands',
- 'fastimport.tests.test_errors',
- 'tests.test_branch_mapper',
- 'tests.test_filter_processor',
- 'tests.test_generic_processor',
- 'tests.test_head_tracking',
- 'tests.test_helpers',
- 'tests.test_parser',
- 'tests.test_revision_store',
+ module_names = [__name__ + '.' + x for x in [
+ 'test_branch_mapper',
+ 'test_filter_processor',
+ 'test_generic_processor',
+ 'test_head_tracking',
+ 'test_helpers',
+ 'test_parser',
+ 'test_revision_store',
]]
loader = TestLoader()
return loader.loadTestsFromModuleNames(module_names)
diff --git a/tests/test_filter_processor.py b/tests/test_filter_processor.py
index da5fdf2..2857873 100644
--- a/tests/test_filter_processor.py
+++ b/tests/test_filter_processor.py
@@ -20,7 +20,7 @@ from cStringIO import StringIO
from testtools import TestCase
-from bzrlib.plugins.fastimport.fastimport import (
+from fastimport import (
parser,
)
diff --git a/tests/test_generic_processor.py b/tests/test_generic_processor.py
index d479d09..4ee2424 100644
--- a/tests/test_generic_processor.py
+++ b/tests/test_generic_processor.py
@@ -17,11 +17,10 @@
import time
from bzrlib import (
- branch,
tests,
)
-from bzrlib.plugins.fastimport.fastimport import (
+from fastimport import (
commands,
)
diff --git a/tests/test_head_tracking.py b/tests/test_head_tracking.py
index e88e366..77bb422 100644
--- a/tests/test_head_tracking.py
+++ b/tests/test_head_tracking.py
@@ -20,7 +20,7 @@ from cStringIO import StringIO
from bzrlib import tests
-from bzrlib.plugins.fastimport.fastimport import (
+from fastimport import (
commands,
parser,
)
diff --git a/tests/test_parser.py b/tests/test_parser.py
index 18475e6..ccc25da 100644
--- a/tests/test_parser.py
+++ b/tests/test_parser.py
@@ -20,7 +20,7 @@ import StringIO
from bzrlib import tests
-from bzrlib.plugins.fastimport.fastimport import (
+from fastimport import (
errors,
parser,
)