diff options
| author | Guido Günther <agx@sigxcpu.org> | 2017-08-02 01:32:37 -0300 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2017-08-02 10:35:05 -0300 |
| commit | 2c0e219e379a19506f16aeb4c0ce61ad8e33f20b (patch) | |
| tree | 94b49752fc422c5358fcb4d95a4613bdb944c4d0 /tests/component | |
| parent | 6b70a76d102a94043663d6212053197297305b45 (diff) | |
test_pq_rpm: adjust log matches
since we strip newlines more consistently now in GitRepository
Diffstat (limited to 'tests/component')
| -rw-r--r-- | tests/component/rpm/test_pq_rpm.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/component/rpm/test_pq_rpm.py b/tests/component/rpm/test_pq_rpm.py index baa12218..d7fdf9cb 100644 --- a/tests/component/rpm/test_pq_rpm.py +++ b/tests/component/rpm/test_pq_rpm.py @@ -345,16 +345,12 @@ class TestPqRpm(RpmRepoTestBase): with open('my2.patch', 'w') as patch_file: patch_file.write('-this-does\n+not-apply\n') eq_(mock_pq(['import']), 1) - self._check_log(-2, "(" - "Aborting|" - "Please, commit your changes or stash them|" - "gbp:error: Import failed.* You have local changes" - ")") + self._check_log(-2, "Please commit your changes or stash them") self._check_repo_state(repo, 'master', branches) # Now commit the changes to the patch and try again repo.add_files(['my2.patch'], force=True) repo.commit_files(['my2.patch'], msg="Mangle patch") eq_(mock_pq(['import']), 1) - self._check_log(-2, "gbp:error: Import failed: Error running git apply") + self._check_log(-1, "gbp:error: Import failed: Error running git apply") self._check_repo_state(repo, 'master', branches) |