Charm Helpers

Merge lp:~ajkavanagh/charm-helpers/fix-r765-breakage into lp:charm-helpers

  1. fix-r765-breakage
  2. Merge into devel
Proposed by Alex Kavanagh
Status: Merged
Merged at revision: 766
Proposed branch: lp:~ajkavanagh/charm-helpers/fix-r765-breakage
Merge into: lp:charm-helpers
Diff against target: 169 lines (+23/-2)
1 file modified
tests/contrib/openstack/test_os_contexts.py (+23/-2)
To merge this branch: bzr merge lp:~ajkavanagh/charm-helpers/fix-r765-breakage
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+327879@code.launchpad.net

Description of the change

Fix breakage in tests that merge r765 created

Unfortunately, r765 was merged to tip and broke a number of tests due
to the addition of 'rbd-features' in the Ceph related Context. This
patchset just changes the expected in the tests to have that key in
the context.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/contrib/openstack/test_os_contexts.py'
2--- tests/contrib/openstack/test_os_contexts.py 2017-07-05 10:31:39 +0000
3+++ tests/contrib/openstack/test_os_contexts.py 2017-07-21 13:04:09 +0000
4@@ -250,12 +250,14 @@
5 'auth': 'foo',
6 'key': 'bar',
7 'use_syslog': 'true',
8+ 'rbd-features': 'rbd_features1'
9 },
10 'ceph/1': {
11 'private-address': 'ceph_node2',
12 'auth': 'foo',
13 'key': 'bar',
14 'use_syslog': 'false',
15+ 'rbd-features': 'rbd_features2'
16 },
17 }
18 }
19@@ -267,12 +269,14 @@
20 'private-address': 'ceph_node1',
21 'auth': 'foo',
22 'key': 'bar',
23+ 'rbd-features': 'rbd_features1'
24 },
25 'ceph/1': {
26 'ceph-public-address': '192.168.1.11',
27 'private-address': 'ceph_node2',
28 'auth': 'foo',
29 'key': 'bar',
30+ 'rbd-features': 'rbd_features2'
31 },
32 }
33 }
34@@ -284,12 +288,14 @@
35 'private-address': 'ceph_node1',
36 'auth': 'foo',
37 'key': 'bar',
38+ 'rbd-features': 'rbd_features1'
39 },
40 'ceph/1': {
41 'ceph-public-address': '192.168.1.11:4321',
42 'private-address': 'ceph_node2',
43 'auth': 'foo',
44 'key': 'bar',
45+ 'rbd-features': 'rbd_features2'
46 },
47 }
48 }
49@@ -301,12 +307,14 @@
50 'private-address': 'ceph_node1',
51 'auth': 'foo',
52 'key': 'bar',
53+ 'rbd-features': 'rbd_features1'
54 },
55 'ceph/1': {
56 'ceph-public-address': '2001:5c0:9168::2',
57 'private-address': 'ceph_node2',
58 'auth': 'foo',
59 'key': 'bar',
60+ 'rbd-features': 'rbd_features2'
61 },
62 }
63 }
64@@ -318,12 +326,14 @@
65 'private-address': 'ceph_node1',
66 'auth': 'foo',
67 'key': 'bar',
68+ 'rbd-features': 'rbd_features1'
69 },
70 'ceph/1': {
71 'ceph-public-address': '[2001:5c0:9168::2]:4321',
72 'private-address': 'ceph_node2',
73 'auth': 'foo',
74 'key': 'bar',
75+ 'rbd-features': 'rbd_features2'
76 },
77 }
78 }
79@@ -335,12 +345,14 @@
80 'private-address': 'ceph_node1',
81 'auth': 'foo',
82 'key': 'bar',
83+ 'rbd-features': 'rbd_features1'
84 },
85 'ceph/1': {
86 'ceph-public-address': '192.168.1.11 192.168.1.21',
87 'private-address': 'ceph_node2',
88 'auth': 'foo',
89 'key': 'bar',
90+ 'rbd-features': 'rbd_features2'
91 },
92 }
93 }
94@@ -1243,7 +1255,8 @@
95 'mon_hosts': 'ceph_node1 ceph_node2',
96 'auth': 'foo',
97 'key': 'bar',
98- 'use_syslog': 'true'
99+ 'use_syslog': 'true',
100+ 'rbd_features': 'rbd_features1',
101 }
102 self.assertEquals(result, expected)
103 ensure_packages.assert_called_with(['ceph-common'])
104@@ -1294,7 +1307,8 @@
105 'mon_hosts': 'ceph_node1 ceph_node2',
106 'auth': 'foo',
107 'key': 'bar',
108- 'use_syslog': 'true'
109+ 'use_syslog': 'true',
110+ 'rbd_features': 'rbd_features1',
111 }
112 self.assertEquals(result, expected)
113
114@@ -1324,6 +1338,7 @@
115 'auth': 'foo',
116 'key': 'bar',
117 'use_syslog': 'true',
118+ 'rbd_features': 'rbd_features1',
119 }
120 self.assertEquals(result, expected)
121 ensure_packages.assert_called_with(['ceph-common'])
122@@ -1355,6 +1370,7 @@
123 'auth': 'foo',
124 'key': 'bar',
125 'use_syslog': 'true',
126+ 'rbd_features': 'rbd_features1',
127 }
128 self.assertEquals(result, expected)
129 ensure_packages.assert_called_with(['ceph-common'])
130@@ -1386,6 +1402,7 @@
131 'auth': 'foo',
132 'key': 'bar',
133 'use_syslog': 'true',
134+ 'rbd_features': 'rbd_features1',
135 }
136 self.assertEquals(result, expected)
137 ensure_packages.assert_called_with(['ceph-common'])
138@@ -1418,6 +1435,7 @@
139 'auth': 'foo',
140 'key': 'bar',
141 'use_syslog': 'true',
142+ 'rbd_features': 'rbd_features1',
143 }
144 self.assertEquals(result, expected)
145 ensure_packages.assert_called_with(['ceph-common'])
146@@ -1449,6 +1467,7 @@
147 'auth': 'foo',
148 'key': 'bar',
149 'use_syslog': 'true',
150+ 'rbd_features': 'rbd_features1',
151 }
152 self.assertEquals(result, expected)
153 ensure_packages.assert_called_with(['ceph-common'])
154@@ -1495,6 +1514,7 @@
155 'auth': 'foo',
156 'key': 'bar',
157 'use_syslog': 'false',
158+ 'rbd_features': 'rbd_features1',
159 }
160 expected['rbd_client_cache_settings'] = \
161 {'rbd cache': 'true',
162@@ -1556,6 +1576,7 @@
163 'auth': 'foo',
164 'key': 'bar',
165 'use_syslog': 'true',
166+ 'rbd_features': 'rbd_features1',
167 }
168 self.assertEquals(result, expected)
169 ensure_packages.assert_called_with(['ceph-common'])

Subscribers

People subscribed via source and target branches