summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2013-04-30 16:57:38 +0200
committerGuido Günther <agx@sigxcpu.org>2013-04-30 16:57:38 +0200
commit5923515c3af2fd4ee0b8f73ea03f9d2debeaf77e (patch)
tree636c553133efa15194af7729f228cb2f80059d3a
parente97d1286b7865ccb81737038571596ad3024af85 (diff)
downloadgit-buildpackage-5923515c3af2fd4ee0b8f73ea03f9d2debeaf77e.tar.gz
git-buildpackage-5923515c3af2fd4ee0b8f73ea03f9d2debeaf77e.tar.bz2
git-buildpackage-5923515c3af2fd4ee0b8f73ea03f9d2debeaf77e.zip
trivial: simplify option assignment
to ease readability
-rw-r--r--tests/11_test_dch_main.py29
1 files changed, 10 insertions, 19 deletions
diff --git a/tests/11_test_dch_main.py b/tests/11_test_dch_main.py
index ef718221..1849a3df 100644
--- a/tests/11_test_dch_main.py
+++ b/tests/11_test_dch_main.py
@@ -168,8 +168,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"""
- options = ["--auto"]
- options.append("--release")
+ options = ["--auto", "--release"]
lines = self.run_dch(options)
self.assertEqual("test-package (1.0-1) %s; urgency=low\n" % os_codename, lines[0])
self.assertIn(""" * added debian/control\n""", lines)
@@ -177,7 +176,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"""
- options = ["--auto"]
+ options = [ "--auto", "--snapshot" ]
options.append("--snapshot")
lines = self.run_dch(options)
header = re.search(snap_header_1, lines[0])
@@ -189,8 +188,7 @@ 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"""
- options = ["--snapshot"]
- options.append("--release")
+ options = ["--snapshot", "--release"]
self.assertRaises(SystemExit, self.run_dch, options)
@@ -204,8 +202,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"""
- options = ["--release"]
- options.extend(["--distribution=testing", "--force-distribution"])
+ options = ["--release", "--distribution=testing", "--force-distribution"]
lines = self.run_dch(options)
self.assertEqual("test-package (1.0-1) testing; urgency=low\n", lines[0])
self.assertIn(""" * added debian/control\n""", lines)
@@ -213,8 +210,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"""
- options = ["--snapshot"]
- options.append("--distribution=testing")
+ options = ["--snapshot", "--distribution=testing"]
lines = self.run_dch(options)
header = re.search(snap_header_1, lines[0])
self.assertIsNotNone(header)
@@ -225,8 +221,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"""
- options = ["--snapshot"]
- options.append("--distribution=testing")
+ options = ["--snapshot", "--distribution=testing"]
lines = self.run_dch(options)
header1 = re.search(snap_header_1, lines[0])
self.assertIsNotNone(header1)
@@ -288,8 +283,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"""
- options = ["--release"]
- options.append("--urgency=emergency")
+ options = ["--release", "--urgency=emergency"]
lines = self.run_dch(options)
self.assertEqual("test-package (1.0-1) %s; urgency=emergency\n" % os_codename, lines[0])
self.assertIn(""" * added debian/control\n""", lines)
@@ -297,8 +291,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"""
- options = ["--snapshot"]
- options.append("--urgency=emergency")
+ options = ["--snapshot", "--urgency=emergency"]
lines = self.run_dch(options)
header = re.search(snap_header_1, lines[0])
self.assertIsNotNone(header)
@@ -350,8 +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"""
self.repo.delete_tag("upstream/1.0")
- options = ["--auto"]
- options.append("--release")
+ options = ["--auto", "--release"]
lines = self.run_dch(options)
self.assertEqual("test-package (%s) %s; urgency=low\n" % (new_version_0_9, os_codename), lines[0])
self.assertIn(""" * added debian/control\n""", lines)
@@ -360,8 +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"""
self.repo.delete_tag("upstream/1.0")
- options = ["--auto"]
- options.append("--snapshot")
+ options = ["--auto", "--snapshot"]
lines = self.run_dch(options)
header = re.search(snap_header_0_9, lines[0])
self.assertIsNotNone(header)