Launchpad itself

Merge ~cjwatson/launchpad:testfix-py3-soyuz-raw-escapes into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. testfix-py3-soyuz-raw-escapes
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 122926de1463bcd2ff1889906da3867db378a73b
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:testfix-py3-soyuz-raw-escapes
Merge into: launchpad:master
Diff against target: 22 lines (+2/-2)
1 file modified
lib/lp/archiveuploader/tests/test_changesfile.py (+2/-2)
Reviewer Review Type Date Requested Status
Thiago F. Pappacena (community) Approve
Review via email: mp+394463@code.launchpad.net

Commit message

Fix text matching in TestSignatureVerification

Description of the change

This was broken by correcting the spelling of \-escapes.

To post a comment you must log in.
Revision history for this message
Thiago F. Pappacena (pappacena) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/archiveuploader/tests/test_changesfile.py b/lib/lp/archiveuploader/tests/test_changesfile.py
2index 18d6a7b..3daf5cc 100644
3--- a/lib/lp/archiveuploader/tests/test_changesfile.py
4+++ b/lib/lp/archiveuploader/tests/test_changesfile.py
5@@ -377,7 +377,7 @@ class TestSignatureVerification(TestCase):
6 self.assertEqual(
7 getUtility(IPersonSet).getByEmail('foo.bar@canonical.com'),
8 changesfile.signer)
9- expected = r"\AFormat: 1.7\n.*foo_1.0-1.diff.gz\Z"
10+ expected = "\\AFormat: 1.7\n.*foo_1.0-1.diff.gz\\Z"
11 self.assertTextMatchesExpressionIgnoreWhitespace(
12 expected,
13 changesfile.parsed_content)
14@@ -399,7 +399,7 @@ class TestSignatureVerification(TestCase):
15 self.assertEqual(
16 getUtility(IPersonSet).getByEmail('foo.bar@canonical.com'),
17 changesfile.signer)
18- expected = r"\AFormat: 1.7\n.*foo_1.0-1.diff.gz\Z"
19+ expected = "\\AFormat: 1.7\n.*foo_1.0-1.diff.gz\\Z"
20 self.assertTextMatchesExpressionIgnoreWhitespace(
21 expected,
22 changesfile.parsed_content)

Subscribers

People subscribed via source and target branches

to status/vote changes: