aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2017-01-01 18:37:42 +0100
committerGuido Günther <agx@sigxcpu.org>2017-01-01 18:39:23 +0100
commit351d45c5e49363c9b5d0f4eb4a3867a7f111a42a (patch)
treec5dca6c11d2183356a540754b8c7b5ea0cfbc039 /tests
parentc3b62fef33e83931d86e5622e6e4f5deecd67fd6 (diff)
Deprecate --download in import_srpm too
Diffstat (limited to 'tests')
-rw-r--r--tests/component/rpm/test_import_srpm.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/component/rpm/test_import_srpm.py b/tests/component/rpm/test_import_srpm.py
index 0c9ff67..3e153f1 100644
--- a/tests/component/rpm/test_import_srpm.py
+++ b/tests/component/rpm/test_import_srpm.py
@@ -284,7 +284,7 @@ class TestDownloadImport(ComponentTestBase):
import_srpm.urlopen = Mock()
import_srpm.urlopen.return_value = open(local_fn, 'r')
- eq_(mock_import(['--no-pristine-tar', '--download', srpm]), 0)
+ eq_(mock_import(['--no-pristine-tar', srpm]), 0)
# Check repository state
repo = GitRepository('gbp-test')
self._check_repo_state(repo, 'master', ['master', 'upstream'])
@@ -297,15 +297,15 @@ class TestDownloadImport(ComponentTestBase):
import_srpm.urlopen.side_effect = urllib.error.HTTPError(srpm, 404, "Not found",
None, None)
- eq_(mock_import(['--download', srpm]), 1)
+ eq_(mock_import([srpm]), 1)
self._check_log(-1, "gbp:error: Download failed: HTTP Error 404")
self._clear_log()
def test_invalid_url(self):
"""Test graceful failure when trying download from invalid url"""
srpm = 'foob://url.does.not.exist.com/foo.src.rpm'
- eq_(mock_import(['--download', srpm]), 1)
- self._check_log(-1, "gbp:error: Download failed: unknown url type:")
+ eq_(mock_import([srpm]), 1)
+ self._check_log(-1, ".*No such file or directory: 'foob://url.does.not.exist.com/foo.src.rpm")
self._clear_log()