Launchpad itself

Merge ~cjwatson/launchpad:fix-rename-master-slave-flavors into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. fix-rename-master-slave-flavors
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: c77f7506140a1d9f5533c3938b8e75581d51359a
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:fix-rename-master-slave-flavors
Merge into: launchpad:master
Diff against target: 105 lines (+19/-19)
2 files modified
lib/lp/code/model/tests/test_branchjob.py (+1/-1)
lib/lp/testing/tests/test_matchers.py (+18/-18)
Reviewer Review Type Date Requested Status
Cristian Gonzalez (community) Approve
Review via email: mp+411603@code.launchpad.net

Commit message

Update some remaining references to master/slave DB flavors

Description of the change

The one in `lib/lp/code/model/tests/test_branchjob.py` caused a test failure.

To post a comment you must log in.
Revision history for this message
Cristian Gonzalez (cristiangsp) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/code/model/tests/test_branchjob.py b/lib/lp/code/model/tests/test_branchjob.py
2index 8db2ac7..ad2dd1b 100644
3--- a/lib/lp/code/model/tests/test_branchjob.py
4+++ b/lib/lp/code/model/tests/test_branchjob.py
5@@ -227,7 +227,7 @@ class TestBranchScanJob(TestCaseWithFactory):
6 actions = [action[2:4] for action in self.oopses[0]['timeline']]
7 # Long action details are truncated.
8 self.assertIn(
9- ('SQL-main-master',
10+ ('SQL-main-primary',
11 "SELECT '" + 'x' * 489 + ' ... ' + 'x' * 496 + "'"),
12 actions)
13 # Short action details are left untouched.
14diff --git a/lib/lp/testing/tests/test_matchers.py b/lib/lp/testing/tests/test_matchers.py
15index 57d7a8a..30c0df1 100644
16--- a/lib/lp/testing/tests/test_matchers.py
17+++ b/lib/lp/testing/tests/test_matchers.py
18@@ -217,8 +217,8 @@ class TestQueryMatching(TestCase):
19 collector = RequestTimelineCollector()
20 collector.count = 2
21 collector.queries = [
22- (0, 1, "SQL-main-slave", "SELECT 1 FROM Person", None),
23- (2, 3, "SQL-main-slave", "SELECT 1 FROM Product", None),
24+ (0, 1, "SQL-main-standby", "SELECT 1 FROM Person", None),
25+ (2, 3, "SQL-main-standby", "SELECT 1 FROM Product", None),
26 ]
27 mismatch = matcher.match(collector)
28 self.assertThat(mismatch, Not(Is(None)))
29@@ -230,8 +230,8 @@ class TestQueryMatching(TestCase):
30 lines.append(''.join(content.iter_text()))
31 separator = "-" * 70
32 expected_lines = [
33- "0-1@SQL-main-slave SELECT 1 FROM Person\n" + separator + "\n" +
34- "2-3@SQL-main-slave SELECT 1 FROM Product\n" + separator,
35+ "0-1@SQL-main-standby SELECT 1 FROM Person\n" + separator + "\n" +
36+ "2-3@SQL-main-standby SELECT 1 FROM Product\n" + separator,
37 ]
38 self.assertEqual(expected_lines, lines)
39 self.assertEqual(
40@@ -243,10 +243,10 @@ class TestQueryMatching(TestCase):
41 collector = RequestTimelineCollector()
42 collector.count = 2
43 collector.queries = [
44- (0, 1, "SQL-main-slave", "SELECT 1 FROM Person",
45+ (0, 1, "SQL-main-standby", "SELECT 1 FROM Person",
46 ' File "example", line 2, in <module>\n'
47 ' Store.of(Person).one()\n'),
48- (2, 3, "SQL-main-slave", "SELECT 1 FROM Product",
49+ (2, 3, "SQL-main-standby", "SELECT 1 FROM Product",
50 ' File "example", line 3, in <module>\n'
51 ' Store.of(Product).one()\n'),
52 ]
53@@ -261,10 +261,10 @@ class TestQueryMatching(TestCase):
54 separator = "-" * 70
55 backtrace_separator = "." * 70
56 expected_lines = [
57- '0-1@SQL-main-slave SELECT 1 FROM Person\n' + separator + '\n' +
58+ '0-1@SQL-main-standby SELECT 1 FROM Person\n' + separator + '\n' +
59 ' File "example", line 2, in <module>\n' +
60 ' Store.of(Person).one()\n' + backtrace_separator + '\n' +
61- '2-3@SQL-main-slave SELECT 1 FROM Product\n' + separator + '\n' +
62+ '2-3@SQL-main-standby SELECT 1 FROM Product\n' + separator + '\n' +
63 ' File "example", line 3, in <module>\n' +
64 ' Store.of(Product).one()\n' + backtrace_separator,
65 ]
66@@ -277,15 +277,15 @@ class TestQueryMatching(TestCase):
67 old_collector = RequestTimelineCollector()
68 old_collector.count = 2
69 old_collector.queries = [
70- (0, 1, "SQL-main-slave", "SELECT 1 FROM Person", None),
71- (2, 3, "SQL-main-slave", "SELECT 1 FROM Product", None),
72+ (0, 1, "SQL-main-standby", "SELECT 1 FROM Person", None),
73+ (2, 3, "SQL-main-standby", "SELECT 1 FROM Product", None),
74 ]
75 new_collector = RequestTimelineCollector()
76 new_collector.count = 3
77 new_collector.queries = [
78- (0, 1, "SQL-main-slave", "SELECT 1 FROM Person", None),
79- (2, 3, "SQL-main-slave", "SELECT 1 FROM Product", None),
80- (4, 5, "SQL-main-slave", "SELECT 1 FROM Distribution", None),
81+ (0, 1, "SQL-main-standby", "SELECT 1 FROM Person", None),
82+ (2, 3, "SQL-main-standby", "SELECT 1 FROM Product", None),
83+ (4, 5, "SQL-main-standby", "SELECT 1 FROM Distribution", None),
84 ]
85 matcher = HasQueryCount.byEquality(old_collector)
86 mismatch = matcher.match(new_collector)
87@@ -300,13 +300,13 @@ class TestQueryMatching(TestCase):
88 new_lines.append("".join(details["queries"].iter_text()))
89 separator = "-" * 70
90 expected_old_lines = [
91- "0-1@SQL-main-slave SELECT 1 FROM Person\n" + separator + "\n" +
92- "2-3@SQL-main-slave SELECT 1 FROM Product\n" + separator,
93+ "0-1@SQL-main-standby SELECT 1 FROM Person\n" + separator + "\n" +
94+ "2-3@SQL-main-standby SELECT 1 FROM Product\n" + separator,
95 ]
96 expected_new_lines = [
97- "0-1@SQL-main-slave SELECT 1 FROM Person\n" + separator + "\n" +
98- "2-3@SQL-main-slave SELECT 1 FROM Product\n" + separator + "\n" +
99- "4-5@SQL-main-slave SELECT 1 FROM Distribution\n" + separator,
100+ "0-1@SQL-main-standby SELECT 1 FROM Person\n" + separator + "\n" +
101+ "2-3@SQL-main-standby SELECT 1 FROM Product\n" + separator + "\n" +
102+ "4-5@SQL-main-standby SELECT 1 FROM Distribution\n" + separator,
103 ]
104 self.assertEqual(expected_old_lines, old_lines)
105 self.assertEqual(expected_new_lines, new_lines)

Subscribers

People subscribed via source and target branches

to status/vote changes: