aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gbp/config.py7
-rwxr-xr-xgbp/scripts/buildpackage.py5
-rw-r--r--gbp/scripts/buildpackage_rpm.py6
-rwxr-xr-xgbp/scripts/clone.py7
-rw-r--r--gbp/scripts/common/__init__.py7
-rwxr-xr-xgbp/scripts/config.py6
-rw-r--r--gbp/scripts/create_remote_repo.py15
-rw-r--r--gbp/scripts/dch.py11
-rw-r--r--gbp/scripts/import_dsc.py7
-rw-r--r--gbp/scripts/import_orig.py6
-rwxr-xr-xgbp/scripts/import_srpm.py6
-rwxr-xr-xgbp/scripts/pq.py6
-rwxr-xr-xgbp/scripts/pq_rpm.py9
-rwxr-xr-xgbp/scripts/pull.py6
-rw-r--r--gbp/scripts/rpm_ch.py8
-rw-r--r--tests/25_test_broken_gbp_conf.py58
-rw-r--r--tests/component/rpm/test_buildpackage_rpm.py13
-rw-r--r--tests/component/rpm/test_pq_rpm.py10
-rw-r--r--tests/component/rpm/test_rpm_ch.py10
19 files changed, 127 insertions, 76 deletions
diff --git a/gbp/config.py b/gbp/config.py
index 3afd3a1..a079447 100644
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -23,6 +23,7 @@ import errno
import os.path
import sys
+from gbp.errors import GbpError
try:
from gbp.version import gbp_version
@@ -509,9 +510,13 @@ class GbpOptionParser(OptionParser):
self.sections = sections
self.prefix = prefix
self.config = {}
- self.parse_config_files()
self.valid_options = []
+ try:
+ self.parse_config_files()
+ except configparser.ParsingError as err:
+ raise GbpError(str(err) + "\nSee 'man gbp.conf' for the format.")
+
OptionParser.__init__(self, option_class=GbpOption,
prog="gbp %s" % self.command,
usage=usage, version='%s %s' % (self.command,
diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py
index dab45e8..a792a04 100755
--- a/gbp/scripts/buildpackage.py
+++ b/gbp/scripts/buildpackage.py
@@ -41,6 +41,7 @@ from gbp.scripts.common.buildpackage import (index_name, wc_name,
git_archive_submodules,
git_archive_single, dump_tree,
write_wc, drop_index)
+from gbp.scripts.common import ExitCodes
from gbp.pkg import compressor_opts, compressor_aliases, parse_archive_filename
#{ upstream tarball preparation
@@ -496,7 +497,7 @@ def md(a, b):
def build_parser(name, prefix=None):
try:
parser = GbpOptionParserDebian(command=os.path.basename(name), prefix=prefix)
- except configparser.ParsingError as err:
+ except GbpError as err:
gbp.log.err(err)
return None
@@ -636,7 +637,7 @@ def main(argv):
options, gbp_args, dpkg_args = parse_args(argv, prefix)
if not options:
- return 1
+ return ExitCodes.parse_error
try:
repo = DebianGitRepository(os.path.curdir)
diff --git a/gbp/scripts/buildpackage_rpm.py b/gbp/scripts/buildpackage_rpm.py
index 6f52a82..8c131f3 100644
--- a/gbp/scripts/buildpackage_rpm.py
+++ b/gbp/scripts/buildpackage_rpm.py
@@ -18,7 +18,6 @@
#
"""Build an RPM package out of a Git repository"""
-from six.moves import configparser
import os
import shutil
import sys
@@ -34,6 +33,7 @@ from gbp.pkg import compressor_opts
from gbp.rpm.git import GitRepositoryError, RpmGitRepository
from gbp.rpm.policy import RpmPkgPolicy
from gbp.tmpfile import init_tmpdir, del_tmpdir, tempfile
+from gbp.scripts.common import ExitCodes
from gbp.scripts.common.buildpackage import (index_name, wc_name,
git_archive_submodules,
git_archive_single, dump_tree,
@@ -317,7 +317,7 @@ def build_parser(name, prefix=None, git_treeish=None):
try:
parser = GbpOptionParserRpm(command=os.path.basename(name),
prefix=prefix)
- except configparser.ParsingError as err:
+ except GbpError as err:
gbp.log.err(err)
return None
@@ -479,7 +479,7 @@ def main(argv):
options, gbp_args, builder_args = parse_args(argv, prefix)
if not options:
- return 1
+ return ExitCodes.parse_error
try:
repo = RpmGitRepository(os.path.curdir)
diff --git a/gbp/scripts/clone.py b/gbp/scripts/clone.py
index af32211..b2717fa 100755
--- a/gbp/scripts/clone.py
+++ b/gbp/scripts/clone.py
@@ -26,6 +26,7 @@ from gbp.config import (GbpOptionParser, GbpOptionGroup)
from gbp.deb.git import DebianGitRepository
from gbp.git import (GitRepository, GitRepositoryError)
from gbp.errors import GbpError
+from gbp.scripts.common import ExitCodes
import gbp.log
@@ -33,7 +34,7 @@ def build_parser(name):
try:
parser = GbpOptionParser(command=os.path.basename(name), prefix='',
usage='%prog [options] repository - clone a remote repository')
- except configparser.ParsingError as err:
+ except GbpError as err:
gbp.log.err(err)
return None
@@ -58,7 +59,7 @@ def build_parser(name):
return parser
-def parse_args (argv):
+def parse_args(argv):
parser = build_parser(argv[0])
if not parser:
return None, None
@@ -73,7 +74,7 @@ def main(argv):
(options, args) = parse_args(argv)
if not options:
- return 1
+ return ExitCodes.parse_error
if len(args) < 2:
gbp.log.err("Need a repository to clone.")
diff --git a/gbp/scripts/common/__init__.py b/gbp/scripts/common/__init__.py
index a24bb62..59b3ca8 100644
--- a/gbp/scripts/common/__init__.py
+++ b/gbp/scripts/common/__init__.py
@@ -15,3 +15,10 @@
# along with this program; if not, please see
# <http://www.gnu.org/licenses/>
"""Parts shared between the deb and rpm commands"""
+
+
+class ExitCodes(object):
+ ok = 0,
+ failed = 1 # Allow other errors
+ no_value = 2 # Value does not exist (gbp config only)
+ parse_error = 3 # Failed to parse configuration file
diff --git a/gbp/scripts/config.py b/gbp/scripts/config.py
index 04dd9c4..006c7aa 100755
--- a/gbp/scripts/config.py
+++ b/gbp/scripts/config.py
@@ -21,7 +21,9 @@ from six.moves import configparser
import sys
import os, os.path
from gbp.config import GbpOptionParser
+from gbp.errors import GbpError
from gbp.scripts.supercommand import import_command
+from gbp.scripts.common import ExitCodes
import gbp.log
@@ -29,7 +31,7 @@ def build_parser(name):
try:
parser = GbpOptionParser(command=os.path.basename(name), prefix='',
usage='%prog [options] command[.optionname] - display configuration settings')
- except configparser.ParsingError as err:
+ except GbpError as err:
gbp.log.err(err)
return None
@@ -119,7 +121,7 @@ def main(argv):
(options, args) = parse_args(argv)
if options is None:
- return retval
+ return ExitCodes.parse_error
gbp.log.setup(options.color, options.verbose, options.color_scheme)
diff --git a/gbp/scripts/create_remote_repo.py b/gbp/scripts/create_remote_repo.py
index db60959..ffc32ea 100644
--- a/gbp/scripts/create_remote_repo.py
+++ b/gbp/scripts/create_remote_repo.py
@@ -20,7 +20,6 @@
from __future__ import print_function
-from six.moves import configparser
import sys
import os, os.path
from six.moves import urllib
@@ -36,8 +35,11 @@ from gbp.config import (GbpOptionParserDebian, GbpOptionGroup)
from gbp.errors import GbpError
from gbp.git import GitRepositoryError
from gbp.deb.git import DebianGitRepository
+from gbp.scripts.common import ExitCodes
+
import gbp.log
+
def print_config(remote, branches):
"""
Print out the git config to push to the newly created repo.
@@ -237,7 +239,7 @@ def build_parser(name, sections=[]):
usage='%prog [options] - '
'create a remote repository',
sections=sections)
- except configparser.ParsingError as err:
+ except GbpError as err:
gbp.log.err(err)
return None
@@ -308,11 +310,10 @@ def main(argv):
changelog = 'debian/changelog'
cmd = []
- try:
- options, args = parse_args(argv)
- except Exception as e:
- print("%s" % e, file=sys.stderr)
- return 1
+ options, args = parse_args(argv)
+
+ if not options:
+ return ExitCodes.parse_error
gbp.log.setup(options.color, options.verbose, options.color_scheme)
try:
diff --git a/gbp/scripts/dch.py b/gbp/scripts/dch.py
index f0b4928..5bc2b62 100644
--- a/gbp/scripts/dch.py
+++ b/gbp/scripts/dch.py
@@ -19,7 +19,6 @@
from __future__ import print_function
-from six.moves import configparser
import os.path
import re
import sys
@@ -33,6 +32,7 @@ from gbp.deb import compare_versions
from gbp.deb.source import DebianSource, DebianSourceError
from gbp.deb.git import GitRepositoryError, DebianGitRepository
from gbp.deb.changelog import ChangeLog, NoChangeLogError
+from gbp.scripts.common import ExitCodes
user_customizations = {}
snapshot_re = re.compile("\s*\*\* SNAPSHOT build @(?P<commit>[a-z0-9]+)\s+\*\*")
@@ -300,7 +300,7 @@ def build_parser(name):
try:
parser = GbpOptionParserDebian(command=os.path.basename(name),
usage='%prog [options] paths')
- except configparser.ParsingError as err:
+ except GbpError as err:
gbp.log.err(err)
return None
@@ -389,7 +389,7 @@ def build_parser(name):
def parse_args(argv):
parser = build_parser(argv[0])
if not parser:
- return None, None
+ return [None] * 4
(options, args) = parser.parse_args(argv[1:])
gbp.log.setup(options.color, options.verbose, options.color_scheme)
@@ -397,6 +397,7 @@ def parse_args(argv):
editor_cmd = process_editor_option(options)
return options, args, dch_options, editor_cmd
+
def main(argv):
ret = 0
changelog = 'debian/changelog'
@@ -405,9 +406,11 @@ def main(argv):
version_change = {}
branch = None
-
options, args, dch_options, editor_cmd = parse_args(argv)
+ if not options:
+ return ExitCodes.parse_error
+
try:
try:
repo = DebianGitRepository('.')
diff --git a/gbp/scripts/import_dsc.py b/gbp/scripts/import_dsc.py
index f7c8a97..78a30ee 100644
--- a/gbp/scripts/import_dsc.py
+++ b/gbp/scripts/import_dsc.py
@@ -16,7 +16,6 @@
# <http://www.gnu.org/licenses/>
"""Import a Debian source package into a Git repository"""
-from six.moves import configparser
import sys
import re
import os
@@ -35,8 +34,10 @@ from gbp.git.modifier import GitModifier
from gbp.config import (GbpOptionParserDebian, GbpOptionGroup,
no_upstream_branch_msg)
from gbp.errors import GbpError
+from gbp.scripts.common import ExitCodes
import gbp.log
+
class SkipImport(Exception):
pass
@@ -210,7 +211,7 @@ def build_parser(name):
try:
parser = GbpOptionParserDebian(command=os.path.basename(name), prefix='',
usage='%prog [options] /path/to/package.dsc')
- except configparser.ParsingError as err:
+ except GbpError as err:
gbp.log.err(err)
return None
@@ -285,7 +286,7 @@ def main(argv):
options, args = parse_args(argv)
if not options:
- return 1
+ return ExitCodes.parse_error
try:
if len(args) != 1:
diff --git a/gbp/scripts/import_orig.py b/gbp/scripts/import_orig.py
index 82c2f42..d8a4f3a 100644
--- a/gbp/scripts/import_orig.py
+++ b/gbp/scripts/import_orig.py
@@ -17,7 +17,6 @@
#
"""Import a new upstream version into a Git repository"""
-from six.moves import configparser
import os
import sys
import tempfile
@@ -32,6 +31,7 @@ from gbp.errors import GbpError
from gbp.pkg import parse_archive_filename
from gbp.format import format_str
import gbp.log
+from gbp.scripts.common import ExitCodes
from gbp.scripts.common.import_orig import (orig_needs_repack, cleanup_tmp_tree,
ask_package_name, ask_package_version,
repack_source, is_link_target, download_orig)
@@ -368,7 +368,7 @@ def build_parser(name):
try:
parser = GbpOptionParserDebian(command=os.path.basename(name), prefix='',
usage='%prog [options] /path/to/upstream-version.tar.gz | --uscan')
- except configparser.ParsingError as err:
+ except GbpError as err:
gbp.log.err(err)
return None
@@ -479,7 +479,7 @@ def main(argv):
(options, args) = parse_args(argv)
if not options:
- return 1
+ return ExitCodes.parse_error
try:
try:
diff --git a/gbp/scripts/import_srpm.py b/gbp/scripts/import_srpm.py
index 3e42f47..5771d30 100755
--- a/gbp/scripts/import_srpm.py
+++ b/gbp/scripts/import_srpm.py
@@ -17,7 +17,6 @@
# <http://www.gnu.org/licenses/>
"""Import an RPM source package into a Git repository"""
-from six.moves import configparser
import sys
import re
import os
@@ -37,6 +36,7 @@ from gbp.git.modifier import GitModifier
from gbp.config import (GbpOptionParserRpm, GbpOptionGroup,
no_upstream_branch_msg)
from gbp.errors import GbpError
+from gbp.scripts.common import ExitCodes
import gbp.log
from gbp.pkg import parse_archive_filename
@@ -123,7 +123,7 @@ def build_parser(name):
prefix='',
usage='%prog [options] /path/to/package'
'.src.rpm')
- except configparser.ParsingError as err:
+ except GbpError as err:
gbp.log.err(err)
return None
@@ -205,6 +205,8 @@ def main(argv):
skipped = False
options, args = parse_args(argv)
+ if not options:
+ return ExitCodes.parse_error
if len(args) != 1:
gbp.log.err("Need to give exactly one package to import. Try --help.")
diff --git a/gbp/scripts/pq.py b/gbp/scripts/pq.py
index 1d20ef9..9d93341 100755
--- a/gbp/scripts/pq.py
+++ b/gbp/scripts/pq.py
@@ -17,7 +17,6 @@
#
"""Manage Debian patches on a patch queue branch"""
-from six.moves import configparser
import errno
import os
import shutil
@@ -35,6 +34,7 @@ from gbp.scripts.common.pq import (is_pq_branch, pq_branch_name, pq_branch_base,
switch_to_pq_branch, apply_single_patch,
apply_and_commit_patch, switch_pq,
drop_pq, get_maintainer_from_control)
+from gbp.scripts.common import ExitCodes
from gbp.dch import extract_bts_cmds
PATCH_DIR = "debian/patches/"
@@ -334,7 +334,7 @@ def build_parser(name):
" drop drop (delete) the patch queue associated to the current branch.\n"
" apply apply a patch\n"
" switch switch to patch-queue branch and vice versa")
- except configparser.ParsingError as err:
+ except GbpError as err:
gbp.log.err(err)
return None
@@ -369,7 +369,7 @@ def main(argv):
(options, args) = parse_args(argv)
if not options:
- return 1
+ return ExitCodes.parse_error
gbp.log.setup(options.color, options.verbose, options.color_scheme)
diff --git a/gbp/scripts/pq_rpm.py b/gbp/scripts/pq_rpm.py
index b38427e..6e7b4ef 100755
--- a/gbp/scripts/pq_rpm.py
+++ b/gbp/scripts/pq_rpm.py
@@ -18,7 +18,6 @@
#
"""manage patches in a patch queue"""
-from six.moves import configparser
import bz2
import errno
import gzip
@@ -37,10 +36,12 @@ from gbp.patch_series import PatchSeries, Patch
from gbp.pkg import parse_archive_filename
from gbp.rpm import (SpecFile, NoSpecError, guess_spec, guess_spec_repo,
spec_from_repo)
+from gbp.scripts.common import ExitCodes
from gbp.scripts.common.pq import (is_pq_branch, pq_branch_name, pq_branch_base,
parse_gbp_commands, format_patch, format_diff,
switch_to_pq_branch, apply_single_patch, apply_and_commit_patch,
drop_pq, switch_pq)
+
from gbp.scripts.common.buildpackage import dump_tree
@@ -360,8 +361,8 @@ drop Drop (delete) the patch queue /devel branch associated to
apply Apply a patch
switch Switch to patch-queue branch and vice versa.""")
- except configparser.ParsingError as err:
- gbp.log.err('Invalid config file: %s' % err)
+ except GbpError as err:
+ gbp.log.err(err)
return None
parser.add_boolean_config_file_option(option_name="patch-numbers",
@@ -398,7 +399,7 @@ def main(argv):
(options, args) = parse_args(argv)
if not options:
- return 1
+ return ExitCodes.parse_error
gbp.log.setup(options.color, options.verbose, options.color_scheme)
diff --git a/gbp/scripts/pull.py b/gbp/scripts/pull.py
index f019608..23ea4ce 100755
--- a/gbp/scripts/pull.py
+++ b/gbp/scripts/pull.py
@@ -19,7 +19,6 @@
#
"""Pull remote changes and fast forward debian, upstream and pristine-tar branch"""
-from six.moves import configparser
import sys
import os
import os.path
@@ -28,6 +27,7 @@ from gbp.config import (GbpOptionParser, GbpOptionGroup)
from gbp.errors import GbpError
from gbp.git import GitRepositoryError
from gbp.deb.git import DebianGitRepository
+from gbp.scripts.common import ExitCodes
import gbp.log
@@ -75,7 +75,7 @@ def build_parser(name):
try:
parser = GbpOptionParser(command=os.path.basename(name), prefix='',
usage='%prog [options] - safely update a repository from remote')
- except configparser.ParsingError as err:
+ except GbpError as err:
gbp.log.err(err)
return None
@@ -112,7 +112,7 @@ def main(argv):
(options, args) = parse_args(argv)
if not options:
- return 1
+ return ExitCodes.parse_error
gbp.log.setup(options.color, options.verbose, options.color_scheme)
diff --git a/gbp/scripts/rpm_ch.py b/gbp/scripts/rpm_ch.py
index 3c5ea8d..d1ca2b5 100644
--- a/gbp/scripts/rpm_ch.py
+++ b/gbp/scripts/rpm_ch.py
@@ -18,7 +18,6 @@
#
"""Generate RPM changelog entries from git commit messages"""
-import ConfigParser
from datetime import datetime
import os.path
import pwd
@@ -35,6 +34,7 @@ from gbp.rpm import (guess_spec, NoSpecError, SpecFile, split_version_str,
from gbp.rpm.changelog import Changelog, ChangelogParser, ChangelogError
from gbp.rpm.git import GitRepositoryError, RpmGitRepository
from gbp.rpm.policy import RpmPkgPolicy
+from gbp.scripts.common import ExitCodes
from gbp.tmpfile import init_tmpdir, del_tmpdir
@@ -309,8 +309,8 @@ def build_parser(name):
try:
parser = GbpOptionParserRpm(command=os.path.basename(name),
prefix='', usage='%prog [options] paths')
- except ConfigParser.ParsingError as err:
- gbp.log.error('invalid config file: %s' % err)
+ except GbpError as err:
+ gbp.log.error(err)
return None
range_grp = GbpOptionGroup(parser, "commit range options",
@@ -398,7 +398,7 @@ def main(argv):
"""Script main function"""
options, args = parse_args(argv)
if not options:
- return 1
+ return ExitCodes.parse_error
try:
init_tmpdir(options.tmp_dir, prefix='rpm-ch_')
diff --git a/tests/25_test_broken_gbp_conf.py b/tests/25_test_broken_gbp_conf.py
new file mode 100644
index 0000000..79d551f
--- /dev/null
+++ b/tests/25_test_broken_gbp_conf.py
@@ -0,0 +1,58 @@
+# vim: set fileencoding=utf-8 :
+
+"""Check if we fail correcdtly on broken gbp.conf"""
+
+from . import context
+
+from . testutils.data import TestCaseWithData
+from . testutils.gbplogtester import GbpLogTester
+
+import os
+import unittest
+
+
+class TestBrokenConfig(TestCaseWithData, GbpLogTester):
+ """Test that broken config gives a sensible error for all commands"""
+
+ cmds = ['buildpackage',
+ 'clone',
+ 'config',
+ 'create_remote_repo',
+ 'dch',
+ 'import_orig',
+ 'import_dsc',
+ 'pull',
+ 'pq',
+ 'import_srpm',
+ 'buildpackage_rpm',
+ 'pq_rpm',
+ 'rpm_ch']
+
+ def __init__(self, methodName='runTest'):
+ unittest.TestCase.__init__(self, methodName)
+ GbpLogTester.__init__(self)
+
+ def setUp(self):
+ tmpdir = str(context.new_tmpdir('bar'))
+ confname = os.path.join(tmpdir, 'gbp.conf')
+ with open(confname, 'w') as f:
+ f.write("this is a broken config\n")
+ os.environ['GBP_CONF_FILES'] = confname
+ self._capture_log(True)
+
+ def tearDown(self):
+ del os.environ['GBP_CONF_FILES']
+
+ @TestCaseWithData.feed(cmds)
+ def testBrokenConf(self, cmd):
+ module = 'gbp.scripts.%s' % cmd
+ try:
+ m = __import__(module, globals(), locals(), ['main'], 0)
+ ret = m.main([cmd, '--help'])
+ self.assertEquals(ret, 3)
+ except Exception as e:
+ self.assertTrue(False, "Caught '%s'" % e)
+ self._check_log(-1, "See 'man gbp.conf' for the format.")
+ self._clear_log()
+
+# vim:et:ts=4:sw=4:et:sts=4:ai:set list listchars=tab\:»·,trail\:·:
diff --git a/tests/component/rpm/test_buildpackage_rpm.py b/tests/component/rpm/test_buildpackage_rpm.py
index 29b6df3..ab3d579 100644
--- a/tests/component/rpm/test_buildpackage_rpm.py
+++ b/tests/component/rpm/test_buildpackage_rpm.py
@@ -106,17 +106,6 @@ class TestGbpRpm(RpmRepoTestBase):
self._check_log(0, 'gbp:error: %s is not a git repository' %
os.path.abspath('.'))
- def test_invalid_config_file(self):
- """Test invalid config file"""
- # Create and commit dummy invalid config file
- repo = GitRepository.create('.')
- with open('.gbp.conf', 'w') as conffd:
- conffd.write('foobar\n')
- repo.add_files('.gbp.conf')
- repo.commit_all('Add conf')
- eq_(mock_gbp([]), 1)
- self._check_log(0, 'gbp:error: File contains no section headers.')
-
def test_native_build(self):
"""Basic test of native pkg"""
self.init_test_repo('gbp-test-native')
@@ -224,7 +213,7 @@ class TestGbpRpm(RpmRepoTestBase):
eq_(mock_gbp(['--git-tag', '--git-packaging-tag=rel-tag']), 1)
# Re-tag
- eq_(mock_gbp(['--git-retag', '--git-packaging-tag=rel-tag']), 1)
+ eq_(mock_gbp(['--git-retag', '--git-packaging-tag=rel-tag']), 3)
self._check_log(-1, "gbp:error: '--git-retag' needs either '--git-tag'")
eq_(mock_gbp(['--git-tag', '--git-packaging-tag=rel-tag',
diff --git a/tests/component/rpm/test_pq_rpm.py b/tests/component/rpm/test_pq_rpm.py
index 3746fb9..c329f7a 100644
--- a/tests/component/rpm/test_pq_rpm.py
+++ b/tests/component/rpm/test_pq_rpm.py
@@ -61,16 +61,6 @@ class TestPqRpm(RpmRepoTestBase):
self._check_log(0, 'gbp:error: %s is not a git repository' %
os.path.abspath(os.getcwd()))
- def test_invalid_config_file(self):
- """Test invalid config file"""
- # Create dummy invalid config file and run pq-rpm
- GitRepository.create('.')
- with open('.gbp.conf', 'w') as conffd:
- conffd.write('foobar\n')
- eq_(mock_pq(['foo']), 1)
- self._check_log(0, 'gbp:error: Invalid config file: File contains no '
- 'section headers.')
-
def test_import_export(self):
"""Basic test for patch import and export"""
repo = self.init_test_repo('gbp-test')
diff --git a/tests/component/rpm/test_rpm_ch.py b/tests/component/rpm/test_rpm_ch.py
index b55c669..6cfa403 100644
--- a/tests/component/rpm/test_rpm_ch.py
+++ b/tests/component/rpm/test_rpm_ch.py
@@ -65,16 +65,6 @@ class TestRpmCh(RpmRepoTestBase):
eq_(mock_ch([]), 1)
self._check_log(0, 'gbp:error: No Git repository at ')
- def test_invalid_config_file(self):
- """Test invalid config file"""
- # Create dummy invalid config file and run git-rpm-ch
- GitRepository.create('.')
- with open('.gbp.conf', 'w') as conffd:
- conffd.write('foobar\n')
- eq_(mock_ch([]), 1)
- self._check_log(0, 'gbp:error: invalid config file: File contains no '
- 'section headers.')
-
def test_update_spec_changelog(self):
"""Test updating changelog in spec"""
repo = self.init_test_repo('gbp-test')