From 8de3ae9567e821ad8432f67afd8756b35189ecba Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Fri, 27 Mar 2015 11:36:25 +0100 Subject: tests: minor test case cleanups Remove unused imports, remove unused variables or actually use them --- tests/06_test_upstream_source.py | 2 -- tests/07_test_fastimport.py | 2 -- tests/11_test_dch_main.py | 46 ++++++++++++++++++------------------- tests/13_test_gbp_pq.py | 2 ++ tests/18_test_Config.py | 1 - tests/19_test_gbp_scripts_config.py | 3 +-- tests/20_test_rpm.py | 6 ++--- tests/component/rpm/test_pq_rpm.py | 1 - tests/test_GitVfs.py | 2 -- 9 files changed, 29 insertions(+), 36 deletions(-) diff --git a/tests/06_test_upstream_source.py b/tests/06_test_upstream_source.py index 34787bf..3a6f92e 100644 --- a/tests/06_test_upstream_source.py +++ b/tests/06_test_upstream_source.py @@ -6,9 +6,7 @@ from . import context import glob import os -import shutil import tarfile -import tempfile import unittest import zipfile diff --git a/tests/07_test_fastimport.py b/tests/07_test_fastimport.py index 0a14d38..dcd63f9 100644 --- a/tests/07_test_fastimport.py +++ b/tests/07_test_fastimport.py @@ -5,8 +5,6 @@ from . import context import os -import shutil -import tempfile import gbp.log import gbp.git diff --git a/tests/11_test_dch_main.py b/tests/11_test_dch_main.py index ac747e6..4f27131 100644 --- a/tests/11_test_dch_main.py +++ b/tests/11_test_dch_main.py @@ -85,14 +85,14 @@ class TestScriptDch(DebianGitTestRepo): def test_dch_main_new_upstream_version(self): - """Test dch.py like git-dch script does: new upstream version""" + """Test dch.py like gbp dch script does: new upstream version""" lines = self.run_dch() self.assertEqual("test-package (1.0-1) UNRELEASED; urgency=%s\n" % default_urgency, lines[0]) self.assertIn(""" * added debian/control\n""", lines) def test_dch_main_new_upstream_version_with_release(self): - """Test dch.py like git-dch script does: new upstream version - release""" + """Test dch.py like gbp dch script does: new upstream version - release""" options = ["--release"] lines = self.run_dch(options) self.assertEqual("test-package (1.0-1) %s; urgency=%s\n" % (os_codename, default_urgency), lines[0]) @@ -100,7 +100,7 @@ class TestScriptDch(DebianGitTestRepo): def test_dch_main_new_upstream_version_with_auto(self): - """Test dch.py like git-dch script does: new upstream version - guess last commit""" + """Test dch.py like gbp dch script does: new upstream version - guess last commit""" options = ["--auto"] lines = self.run_dch(options) self.assertEqual("test-package (1.0-1) UNRELEASED; urgency=%s\n" % default_urgency, lines[0]) @@ -108,7 +108,7 @@ class TestScriptDch(DebianGitTestRepo): def test_dch_main_new_upstream_version_with_snapshot(self): - """Test dch.py like git-dch script does: new upstream version - snapshot mode""" + """Test dch.py like gbp dch script does: new upstream version - snapshot mode""" options = ["--snapshot"] lines = self.run_dch(options) header = re.search(snap_header_1, lines[0]) @@ -119,7 +119,7 @@ class TestScriptDch(DebianGitTestRepo): def test_dch_main_new_upstream_version_with_2_snapshots_auto(self): - """Test dch.py like git-dch script does: new upstream version - two snapshots - auto""" + """Test dch.py like gbp dch script does: new upstream version - two snapshots - auto""" options = ["--snapshot"] lines = self.run_dch(options) header1 = re.search(snap_header_1, lines[0]) @@ -142,7 +142,7 @@ class TestScriptDch(DebianGitTestRepo): def test_dch_main_new_upstream_version_with_2_snapshots_commit_auto(self): - """Test dch.py like git-dch script does: new upstream version - two committed snapshots - auto""" + """Test dch.py like gbp dch script does: new upstream version - two committed snapshots - auto""" options = ["--commit"] options.append("--commit-msg=TEST-COMMITTED-SNAPSHOT") options.append("--snapshot") @@ -169,7 +169,7 @@ class TestScriptDch(DebianGitTestRepo): def test_dch_main_new_upstream_version_with_auto_release(self): - """Test dch.py like git-dch script does: new upstream version - auto - release""" + """Test dch.py like gbp dch script does: new upstream version - auto - release""" options = ["--auto", "--release"] lines = self.run_dch(options) self.assertEqual("test-package (1.0-1) %s; urgency=%s\n" % (os_codename, default_urgency), lines[0]) @@ -177,7 +177,7 @@ class TestScriptDch(DebianGitTestRepo): def test_dch_main_new_upstream_version_with_auto_snapshot(self): - """Test dch.py like git-dch script does: new upstream version - auto - snapshot mode""" + """Test dch.py like gbp dch script does: new upstream version - auto - snapshot mode""" options = [ "--auto", "--snapshot" ] options.append("--snapshot") lines = self.run_dch(options) @@ -189,13 +189,13 @@ class TestScriptDch(DebianGitTestRepo): def test_dch_main_new_upstream_version_with_snapshot_release(self): - """Test dch.py like git-dch script does: new upstream version - snapshot - release""" + """Test dch.py like gbp dch script does: new upstream version - snapshot - release""" options = ["--snapshot", "--release"] self.assertRaises(SystemExit, self.run_dch, options) def test_dch_main_new_upstream_version_with_distribution(self): - """Test dch.py like git-dch script does: new upstream version - set distribution""" + """Test dch.py like gbp dch script does: new upstream version - set distribution""" options = ["--distribution=testing", "--force-distribution"] lines = self.run_dch(options) self.assertEqual("test-package (1.0-1) testing; urgency=%s\n" % default_urgency, lines[0]) @@ -203,7 +203,7 @@ class TestScriptDch(DebianGitTestRepo): def test_dch_main_new_upstream_version_with_release_distribution(self): - """Test dch.py like git-dch script does: new upstream version - release - set distribution""" + """Test dch.py like gbp dch script does: new upstream version - release - set distribution""" options = ["--release", "--distribution=testing", "--force-distribution"] lines = self.run_dch(options) self.assertEqual("test-package (1.0-1) testing; urgency=%s\n" % default_urgency, lines[0]) @@ -211,7 +211,7 @@ class TestScriptDch(DebianGitTestRepo): def test_dch_main_new_upstream_version_with_snapshot_distribution(self): - """Test dch.py like git-dch script does: new upstream version - snapshot mode - do not set distribution""" + """Test dch.py like gbp dch script does: new upstream version - snapshot mode - do not set distribution""" options = ["--snapshot", "--distribution=testing"] lines = self.run_dch(options) header = re.search(snap_header_1, lines[0]) @@ -222,7 +222,7 @@ class TestScriptDch(DebianGitTestRepo): def test_dch_main_new_upstream_version_with_2_snapshots_auto_distribution(self): - """Test dch.py like git-dch script does: new upstream version - two snapshots - do not set distribution""" + """Test dch.py like gbp dch script does: new upstream version - two snapshots - do not set distribution""" options = ["--snapshot", "--distribution=testing"] lines = self.run_dch(options) header1 = re.search(snap_header_1, lines[0]) @@ -248,7 +248,7 @@ class TestScriptDch(DebianGitTestRepo): def test_dch_main_new_upstream_version_with_2_snapshots_commit_auto_distribution(self): - """Test dch.py like git-dch script does: new upstream version - two committed snapshots - do not set distribution""" + """Test dch.py like gbp dch script does: new upstream version - two committed snapshots - do not set distribution""" options = ["--commit"] options.append("--commit-msg=TEST-COMMITTED-SNAPSHOT") options.append("--snapshot") @@ -276,7 +276,7 @@ class TestScriptDch(DebianGitTestRepo): def test_dch_main_new_upstream_version_with_urgency(self): - """Test dch.py like git-dch script does: new upstream version - set urgency""" + """Test dch.py like gbp dch script does: new upstream version - set urgency""" options = ["--urgency=emergency"] lines = self.run_dch(options) self.assertEqual("test-package (1.0-1) UNRELEASED; urgency=emergency\n", lines[0]) @@ -284,7 +284,7 @@ class TestScriptDch(DebianGitTestRepo): def test_dch_main_new_upstream_version_with_release_urgency(self): - """Test dch.py like git-dch script does: new upstream version - release - set urgency""" + """Test dch.py like gbp dch script does: new upstream version - release - set urgency""" options = ["--release", "--urgency=emergency"] lines = self.run_dch(options) self.assertEqual("test-package (1.0-1) %s; urgency=emergency\n" % os_codename, lines[0]) @@ -292,7 +292,7 @@ class TestScriptDch(DebianGitTestRepo): def test_dch_main_new_upstream_version_with_snapshot_urgency(self): - """Test dch.py like git-dch script does: new upstream version - snapshot mode - set urgency""" + """Test dch.py like gbp dch script does: new upstream version - snapshot mode - set urgency""" options = ["--snapshot", "--urgency=emergency"] lines = self.run_dch(options) header = re.search(snap_header_1, lines[0]) @@ -303,7 +303,7 @@ class TestScriptDch(DebianGitTestRepo): def test_dch_main_increment_debian_version(self): - """Test dch.py like git-dch script does: increment debian version""" + """Test dch.py like gbp dch script does: increment debian version""" self.repo.delete_tag("debian/0.9-1") self.repo.create_tag("debian/0.9-1", msg="Pre stable release version 0.9-1", commit="HEAD~2") self.repo.delete_tag("upstream/1.0") @@ -313,7 +313,7 @@ class TestScriptDch(DebianGitTestRepo): def test_dch_main_increment_debian_version_with_release(self): - """Test dch.py like git-dch script does: increment debian version - release""" + """Test dch.py like gbp dch script does: increment debian version - release""" self.repo.delete_tag("upstream/1.0") options = ["--release"] lines = self.run_dch(options) @@ -322,7 +322,7 @@ class TestScriptDch(DebianGitTestRepo): def test_dch_main_increment_debian_version_with_auto(self): - """Test dch.py like git-dch script does: increment debian version - guess last commit""" + """Test dch.py like gbp dch script does: increment debian version - guess last commit""" self.repo.delete_tag("upstream/1.0") options = ["--auto"] lines = self.run_dch(options) @@ -331,7 +331,7 @@ class TestScriptDch(DebianGitTestRepo): def test_dch_main_increment_debian_version_with_snapshot(self): - """Test dch.py like git-dch script does: increment debian version - snapshot mode""" + """Test dch.py like gbp dch script does: increment debian version - snapshot mode""" self.repo.delete_tag("upstream/1.0") options = ["--snapshot"] lines = self.run_dch(options) @@ -343,7 +343,7 @@ class TestScriptDch(DebianGitTestRepo): def test_dch_main_increment_debian_version_with_auto_release(self): - """Test dch.py like git-dch script does: increment debian version - auto - release""" + """Test dch.py like gbp dch script does: increment debian version - auto - release""" self.repo.delete_tag("upstream/1.0") options = ["--auto", "--release"] lines = self.run_dch(options) @@ -352,7 +352,7 @@ class TestScriptDch(DebianGitTestRepo): def test_dch_main_increment_debian_version_with_auto_snapshot(self): - """Test dch.py like git-dch script does: increment debian version - auto - snapshot mode""" + """Test dch.py like gbp dch script does: increment debian version - auto - snapshot mode""" self.repo.delete_tag("upstream/1.0") options = ["--auto", "--snapshot"] lines = self.run_dch(options) diff --git a/tests/13_test_gbp_pq.py b/tests/13_test_gbp_pq.py index 57ce83b..d8f76dc 100644 --- a/tests/13_test_gbp_pq.py +++ b/tests/13_test_gbp_pq.py @@ -120,6 +120,8 @@ class TestWritePatch(testutils.DebianGitTestRepo): opts)[0] expected = os.path.join(str(d), 'gbptest', 'added-foo.patch') + self.assertEqual(os.path.basename(patchfile), + 'added-foo.patch') self.assertTrue(os.path.exists(expected)) logging.debug(open(expected).read()) diff --git a/tests/18_test_Config.py b/tests/18_test_Config.py index 3f60e45..d3d9461 100644 --- a/tests/18_test_Config.py +++ b/tests/18_test_Config.py @@ -1,7 +1,6 @@ # vim: set fileencoding=utf-8 : import os -import sys import unittest from gbp.config import GbpOptionParser, GbpOptionGroup from .testutils import GbpLogTester diff --git a/tests/19_test_gbp_scripts_config.py b/tests/19_test_gbp_scripts_config.py index f503ef5..528cc01 100644 --- a/tests/19_test_gbp_scripts_config.py +++ b/tests/19_test_gbp_scripts_config.py @@ -13,10 +13,9 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -"""Test L{gbp} config""" +"""Test the L{gbp} config command""" import os -import sys import unittest import gbp.scripts.config diff --git a/tests/20_test_rpm.py b/tests/20_test_rpm.py index f6f2574..026333e 100644 --- a/tests/20_test_rpm.py +++ b/tests/20_test_rpm.py @@ -20,11 +20,11 @@ import filecmp import os import shutil import tempfile -from nose.tools import assert_raises, eq_, ok_ # pylint: disable=E0611 +from nose.tools import assert_raises, eq_ # pylint: disable=E0611 from gbp.errors import GbpError -from gbp.rpm import (SrcRpmFile, SpecFile, parse_srpm, NoSpecError, guess_spec, - guess_spec_repo, spec_from_repo) +from gbp.rpm import (SpecFile, NoSpecError, guess_spec, guess_spec_repo, + spec_from_repo) from gbp.git.repository import GitRepository # Disable "Method could be a function" diff --git a/tests/component/rpm/test_pq_rpm.py b/tests/component/rpm/test_pq_rpm.py index f0dac8d..0ebaaa2 100644 --- a/tests/component/rpm/test_pq_rpm.py +++ b/tests/component/rpm/test_pq_rpm.py @@ -147,7 +147,6 @@ class TestPqRpm(RpmRepoTestBase): def test_switch(self): """Basic test for switch action""" repo = self.init_test_repo('gbp-test') - pkg_files = repo.list_files() branches = repo.get_local_branches() + ['patch-queue/master'] # Switch to non-existent pq-branch should create one eq_(mock_pq(['switch']), 0) diff --git a/tests/test_GitVfs.py b/tests/test_GitVfs.py index 8fec765..a88282f 100644 --- a/tests/test_GitVfs.py +++ b/tests/test_GitVfs.py @@ -9,8 +9,6 @@ import gbp.log from . import context gbp.log.setup(color=False, verbose=True) -import gbp.git - def test_read(): """ -- cgit v1.2.3