Skip to content

Commit 84a7bd3

Browse files
committed
Fix generation check test, fix flake8
1 parent 55d93c1 commit 84a7bd3

1 file changed

Lines changed: 10 additions & 8 deletions

File tree

f5/bigip/test/test_resource.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -218,16 +218,18 @@ def test__create_with_Collision():
218218

219219

220220
class TestResource_update(object):
221-
def itest__check_generation_with_mismatch(self):
221+
def test__check_generation_with_mismatch(self):
222222
# generation is borked server-side
223223
r = Resource(mock.MagicMock())
224224
r._meta_data['allowed_lazy_attributes'] = []
225225
r._meta_data['uri'] = 'URI'
226226
r._meta_data['bigip']._meta_data['icr_session'].get.return_value =\
227227
MockResponse({u"generation": 0})
228+
r._meta_data['bigip']._meta_data['icr_session'].put.return_value =\
229+
MockResponse({u"generation": 0})
228230
r.generation = 1
229231
with pytest.raises(GenerationMismatch) as GMEIO:
230-
r.update(a=u"b")
232+
r.update(a=u"b", force=False)
231233
assert GMEIO.value.message ==\
232234
'The generation of the object on the BigIP (0)'\
233235
' does not match the current object(1)'
@@ -281,22 +283,22 @@ def test_read_only_removal(self):
281283

282284
def test_reduce_boolean_removes_enabled(self, fake_rsrc):
283285
fake_rsrc.update(enabled=False)
284-
pos, kwargs = fake_rsrc._meta_data['bigip']._meta_data['icr_session'].put.\
285-
call_args
286+
pos, kwargs = fake_rsrc._meta_data['bigip'].\
287+
_meta_data['icr_session'].put.call_args
286288
assert kwargs['json']['disabled'] is True
287289
assert 'enabled' not in kwargs['json']
288290

289291
def test_reduce_boolean_removes_disabled(self, fake_rsrc):
290292
fake_rsrc.update(disabled=False)
291-
pos, kwargs = fake_rsrc._meta_data['bigip']._meta_data['icr_session'].put.\
292-
call_args
293+
pos, kwargs = fake_rsrc._meta_data['bigip'].\
294+
_meta_data['icr_session'].put.call_args
293295
assert kwargs['json']['enabled'] is True
294296
assert 'disabled' not in kwargs['json']
295297

296298
def test_reduce_boolean_removes_nothing(self, fake_rsrc):
297299
fake_rsrc.update(partition='Common', name='test_create', enabled=True)
298-
pos, kwargs = fake_rsrc._meta_data['bigip']._meta_data['icr_session'].put.\
299-
call_args
300+
pos, kwargs = fake_rsrc._meta_data['bigip'].\
301+
_meta_data['icr_session'].put.call_args
300302
assert kwargs['json']['enabled'] is True
301303
assert 'disabled' not in kwargs['json']
302304

0 commit comments

Comments
 (0)