Revision 61f8fda4
b/lib/rapi/baserlib.py | ||
---|---|---|
263 | 263 |
@param _client_cls: L{luxi} client class (unittests only) |
264 | 264 |
|
265 | 265 |
""" |
266 |
assert isinstance(queryargs, dict) |
|
267 |
|
|
266 | 268 |
self.items = items |
267 | 269 |
self.queryargs = queryargs |
268 | 270 |
self._req = req |
b/test/py/ganeti.rapi.baserlib_unittest.py | ||
---|---|---|
115 | 115 |
def test(self): |
116 | 116 |
for method in baserlib._SUPPORTED_METHODS: |
117 | 117 |
# Empty handler |
118 |
obj = self._MakeClass(method, {})(None, None, None)
|
|
118 |
obj = self._MakeClass(method, {})(None, {}, None)
|
|
119 | 119 |
for attr in itertools.chain(*baserlib.OPCODE_ATTRS): |
120 | 120 |
self.assertFalse(hasattr(obj, attr)) |
121 | 121 |
|
122 | 122 |
# Direct handler function |
123 | 123 |
obj = self._MakeClass(method, { |
124 | 124 |
method: lambda _: None, |
125 |
})(None, None, None)
|
|
125 |
})(None, {}, None)
|
|
126 | 126 |
self.assertFalse(compat.all(hasattr(obj, attr) |
127 | 127 |
for i in baserlib._SUPPORTED_METHODS |
128 | 128 |
for attr in self._GetMethodAttributes(i))) |
... | ... | |
131 | 131 |
for opcls in [None, object()]: |
132 | 132 |
obj = self._MakeClass(method, { |
133 | 133 |
"%s_OPCODE" % method: opcls, |
134 |
})(None, None, None)
|
|
134 |
})(None, {}, None)
|
|
135 | 135 |
self.assertTrue(callable(getattr(obj, method))) |
136 | 136 |
self.assertEqual(getattr(obj, "%s_OPCODE" % method), opcls) |
137 | 137 |
self.assertFalse(hasattr(obj, "%s_RENAME" % method)) |
... | ... | |
151 | 151 |
class _Empty(baserlib.OpcodeResource): |
152 | 152 |
pass |
153 | 153 |
|
154 |
obj = _Empty(None, None, None)
|
|
154 |
obj = _Empty(None, {}, None)
|
|
155 | 155 |
|
156 | 156 |
for attr in itertools.chain(*baserlib.OPCODE_ATTRS): |
157 | 157 |
self.assertFalse(hasattr(obj, attr)) |
b/test/py/ganeti.rapi.rlib2_unittest.py | ||
---|---|---|
116 | 116 |
rlib2.R_2_nodes, |
117 | 117 |
] |
118 | 118 |
for cls in resources: |
119 |
handler = _CreateHandler(cls, ["name"], [], None, self._FailingClient)
|
|
119 |
handler = _CreateHandler(cls, ["name"], {}, None, self._FailingClient)
|
|
120 | 120 |
self.assertRaises(http.HttpBadGateway, handler.GET) |
121 | 121 |
|
122 | 122 |
|
... | ... | |
130 | 130 |
raise errors.JobQueueFull("test") |
131 | 131 |
|
132 | 132 |
def test(self): |
133 |
handler = _CreateHandler(rlib2.R_2_redist_config, [], [], None,
|
|
133 |
handler = _CreateHandler(rlib2.R_2_redist_config, [], {}, None,
|
|
134 | 134 |
self._SubmitErrorClient) |
135 | 135 |
self.assertRaises(http.HttpServiceUnavailable, handler.PUT) |
136 | 136 |
|
... | ... | |
138 | 138 |
class TestClusterModify(unittest.TestCase): |
139 | 139 |
def test(self): |
140 | 140 |
clfactory = _FakeClientFactory(_FakeClient) |
141 |
handler = _CreateHandler(rlib2.R_2_cluster_modify, [], [], {
|
|
141 |
handler = _CreateHandler(rlib2.R_2_cluster_modify, [], {}, {
|
|
142 | 142 |
"vg_name": "testvg", |
143 | 143 |
"candidate_pool_size": 100, |
144 | 144 |
}, clfactory) |
... | ... | |
158 | 158 |
def testInvalidValue(self): |
159 | 159 |
for attr in ["vg_name", "candidate_pool_size", "beparams", "_-Unknown#"]: |
160 | 160 |
clfactory = _FakeClientFactory(_FakeClient) |
161 |
handler = _CreateHandler(rlib2.R_2_cluster_modify, [], [], {
|
|
161 |
handler = _CreateHandler(rlib2.R_2_cluster_modify, [], {}, {
|
|
162 | 162 |
attr: True, |
163 | 163 |
}, clfactory) |
164 | 164 |
self.assertRaises(http.HttpBadRequest, handler.PUT) |
... | ... | |
168 | 168 |
class TestRedistConfig(unittest.TestCase): |
169 | 169 |
def test(self): |
170 | 170 |
clfactory = _FakeClientFactory(_FakeClient) |
171 |
handler = _CreateHandler(rlib2.R_2_redist_config, [], [], None, clfactory)
|
|
171 |
handler = _CreateHandler(rlib2.R_2_redist_config, [], {}, None, clfactory)
|
|
172 | 172 |
job_id = handler.PUT() |
173 | 173 |
|
174 | 174 |
cl = clfactory.GetNextClient() |
Also available in: Unified diff