From 6ed72d30c2910e8a444dc28f891caa834a26fe1d Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Mon, 13 Nov 2017 09:45:29 +0100 Subject: tests: Standardize test descriptions Gbp-Dch: Ignore --- tests/component/deb/test_export_orig.py | 2 +- tests/component/deb/test_import_dsc.py | 10 +++++----- tests/component/deb/test_pq.py | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/component/deb/test_export_orig.py b/tests/component/deb/test_export_orig.py index f6f5ff6c..e42a1fc2 100644 --- a/tests/component/deb/test_export_orig.py +++ b/tests/component/deb/test_export_orig.py @@ -80,7 +80,7 @@ class TestExportOrig(ComponentTestBase): self.assertTrue(os.path.exists(t), "Tarball %s not found" % t) def test_git_archive_tree_non_existent(self): - """Test that we're tarball generation when commits are missing""" + """Test that we're failing tarball generation when commits are missing""" pkg = 'hello-debhelper' dsc = self._dsc_name(pkg, '2.8-1', 'dsc-3.0-additional-tarballs') diff --git a/tests/component/deb/test_import_dsc.py b/tests/component/deb/test_import_dsc.py index b0a6218a..a3b0aea9 100644 --- a/tests/component/deb/test_import_dsc.py +++ b/tests/component/deb/test_import_dsc.py @@ -119,7 +119,7 @@ class TestImportDsc(ComponentTestBase): self._check_log(-1, "gbp:error: Did not find a dsc file at") def test_create_branches(self): - """Test if creating missing branches works""" + """Test that creating missing branches works""" dsc = self._dsc30('2.6-2') assert import_dsc(['arg0', '--verbose', @@ -176,7 +176,7 @@ class TestImportDsc(ComponentTestBase): ok_(commits == expected, "Found %d pristine-tar commits instead of %d" % (commits, expected)) def test_import_30_additional_tarball_pristine_tar(self): - """Test if importing a package with additional tarballs works""" + """Test that importing a package with additional tarballs works""" def _dsc(version): return os.path.join(DEB_TEST_DATA_DIR, 'dsc-3.0-additional-tarballs', @@ -236,7 +236,7 @@ class TestImportDsc(ComponentTestBase): "please change into this directory otherwise move it away first") def test_import_10(self): - """Test if importing a 1.0 source format package works""" + """Test that importing a 1.0 source format package works""" def _dsc(version): return os.path.join(DEB_TEST_DATA_DIR, 'dsc-1.0', @@ -250,7 +250,7 @@ class TestImportDsc(ComponentTestBase): assert len(repo.get_commits()) == 2 def test_target_dir(self): - """Test if setting the target dir works""" + """Test that setting the target dir works""" dsc = self._dsc30('2.6-2') assert import_dsc(['arg0', '--verbose', @@ -262,7 +262,7 @@ class TestImportDsc(ComponentTestBase): self._check_repo_state(repo, 'master', ['master', 'upstream']) def test_bare(self): - """Test if importing into bare repository""" + """Test that importing into bare repository works""" dsc = self._dsc30('2.6-2') assert import_dsc(['arg0', '--verbose', diff --git a/tests/component/deb/test_pq.py b/tests/component/deb/test_pq.py index 5a2395b4..976e4154 100644 --- a/tests/component/deb/test_pq.py +++ b/tests/component/deb/test_pq.py @@ -37,7 +37,7 @@ class TestPq(ComponentTestBase): @RepoFixtures.quilt30() def test_rebase_import(self, repo): - """Test if rebase imports patches first""" + """Test that rebase imports patches first""" eq_(repo.branch, 'master') eq_(repo.has_branch('patch-queue/master'), False) self._test_pq(repo, 'rebase') @@ -45,7 +45,7 @@ class TestPq(ComponentTestBase): @RepoFixtures.quilt30() def test_switch_import(self, repo): - """Test if switch imports patches first""" + """Test that switch imports patches first""" eq_(repo.branch, 'master') eq_(repo.has_branch('patch-queue/master'), False) self._test_pq(repo, 'switch') -- cgit v1.2.3