diff options
-rw-r--r-- | tests/03_test_dch_guess_version.py | 2 | ||||
-rw-r--r-- | tests/09_test_write_tree.py | 3 | ||||
-rw-r--r-- | tests/10_test_get_upstream_tree.py | 3 | ||||
-rw-r--r-- | tests/11_test_dch_main.py | 8 | ||||
-rw-r--r-- | tests/13_test_gbp_pq.py | 2 | ||||
-rw-r--r-- | tests/14_test_gbp_import_dscs.py | 2 | ||||
-rw-r--r-- | tests/15_test_DebianSource.py | 3 | ||||
-rw-r--r-- | tests/17_test_dch_guess_documented_commit.py | 3 | ||||
-rw-r--r-- | tests/18_test_Config.py | 2 | ||||
-rw-r--r-- | tests/test_Changelog.py | 4 |
10 files changed, 14 insertions, 18 deletions
diff --git a/tests/03_test_dch_guess_version.py b/tests/03_test_dch_guess_version.py index 6109bfb..5dca3b7 100644 --- a/tests/03_test_dch_guess_version.py +++ b/tests/03_test_dch_guess_version.py @@ -4,7 +4,7 @@ from . import context -import testutils +from . import testutils from gbp.scripts import dch diff --git a/tests/09_test_write_tree.py b/tests/09_test_write_tree.py index 314d76f..bad362c 100644 --- a/tests/09_test_write_tree.py +++ b/tests/09_test_write_tree.py @@ -5,11 +5,10 @@ from __future__ import print_function from . import context +from . import testutils import os -import tests.testutils as testutils - import gbp.log import gbp.git import gbp.errors diff --git a/tests/10_test_get_upstream_tree.py b/tests/10_test_get_upstream_tree.py index f489f2b..08a0f05 100644 --- a/tests/10_test_get_upstream_tree.py +++ b/tests/10_test_get_upstream_tree.py @@ -3,8 +3,7 @@ """Test L{buildpackage}'s get_upstream_tree method""" from . import context - -import tests.testutils as testutils +from . import testutils import gbp.errors import gbp.scripts.buildpackage as buildpackage diff --git a/tests/11_test_dch_main.py b/tests/11_test_dch_main.py index dbfc25c..ac747e6 100644 --- a/tests/11_test_dch_main.py +++ b/tests/11_test_dch_main.py @@ -3,14 +3,12 @@ """Test L{gbp.scripts.dch} main""" from . import context - -import unittest - -from tests.testutils import (DebianGitTestRepo, OsReleaseFile, - get_dch_default_urgency) +from .testutils import (DebianGitTestRepo, OsReleaseFile, + get_dch_default_urgency) from gbp.scripts import dch +import unittest import os import re diff --git a/tests/13_test_gbp_pq.py b/tests/13_test_gbp_pq.py index 46110b1..d9fa375 100644 --- a/tests/13_test_gbp_pq.py +++ b/tests/13_test_gbp_pq.py @@ -16,6 +16,7 @@ """Test L{gbp.pq}""" from . import context +from . import testutils import os import logging @@ -24,7 +25,6 @@ import unittest from gbp.scripts.pq import generate_patches, export_patches import gbp.scripts.common.pq as pq import gbp.patch_series -import tests.testutils as testutils class TestApplyAndCommit(testutils.DebianGitTestRepo): """Test L{gbp.pq}'s apply_and_commit""" diff --git a/tests/14_test_gbp_import_dscs.py b/tests/14_test_gbp_import_dscs.py index ba3d5f7..b5569a8 100644 --- a/tests/14_test_gbp_import_dscs.py +++ b/tests/14_test_gbp_import_dscs.py @@ -16,8 +16,8 @@ """Test L{gbp.pq}""" from . import context +from . import testutils -import testutils import gbp.log import gbp.scripts.import_dscs as import_dscs diff --git a/tests/15_test_DebianSource.py b/tests/15_test_DebianSource.py index feca625..c1114e6 100644 --- a/tests/15_test_DebianSource.py +++ b/tests/15_test_DebianSource.py @@ -16,9 +16,10 @@ """Test L{gbp.pq}""" from . import context +from . import testutils import os -import testutils + from gbp.deb.source import DebianSource, DebianSourceError from gbp.deb.format import DebianSourceFormat from gbp.git.vfs import GitVfs diff --git a/tests/17_test_dch_guess_documented_commit.py b/tests/17_test_dch_guess_documented_commit.py index 89eba2d..cda816d 100644 --- a/tests/17_test_dch_guess_documented_commit.py +++ b/tests/17_test_dch_guess_documented_commit.py @@ -3,8 +3,7 @@ """Test L{Changelog}'s guess_version_from_upstream""" from . import context - -import testutils +from . import testutils from gbp.scripts import dch diff --git a/tests/18_test_Config.py b/tests/18_test_Config.py index 1560ece..3f60e45 100644 --- a/tests/18_test_Config.py +++ b/tests/18_test_Config.py @@ -4,7 +4,7 @@ import os import sys import unittest from gbp.config import GbpOptionParser, GbpOptionGroup -from . testutils import GbpLogTester +from .testutils import GbpLogTester class TestConfigParser(unittest.TestCase, GbpLogTester): def __init__(self, methodName='runTest'): diff --git a/tests/test_Changelog.py b/tests/test_Changelog.py index 9b0a0e7..8f807ee 100644 --- a/tests/test_Changelog.py +++ b/tests/test_Changelog.py @@ -229,7 +229,7 @@ def test_add_section(): >>> import tempfile >>> import shutil >>> import gbp.deb.changelog - >>> from tests.testutils import OsReleaseFile + >>> from .testutils import OsReleaseFile >>> os_release = OsReleaseFile('/etc/lsb-release') >>> olddir = os.path.abspath(os.path.curdir) >>> testdir = tempfile.mkdtemp(prefix='gbp-test-changelog-') @@ -275,7 +275,7 @@ def test_add_entry(): >>> import tempfile >>> import shutil >>> import gbp.deb.changelog - >>> from tests.testutils import OsReleaseFile + >>> from .testutils import OsReleaseFile >>> os_release = OsReleaseFile('/etc/lsb-release') >>> olddir = os.path.abspath(os.path.curdir) >>> testdir = tempfile.mkdtemp(prefix='gbp-test-changelog-') |