test_neutron.NeutronTest.test_needs_replace_failed failed with TypeError

[Rabi Mishra]

Traceback:

2017-01-12 11:42:36.677296 | Traceback (most recent call last):
2017-01-12 11:42:36.677331 | File "/home/jenkins/workspace/gate-heat-python35-db/heat/tests/openstack/neutron/test_neutron.py", line 125, in test_needs_replace_failed
2017-01-12 11:42:36.677348 | res.state_set(res.CREATE, res.FAILED)
2017-01-12 11:42:36.677375 | File "/home/jenkins/workspace/gate-heat-python35-db/heat/engine/resource.py", line 2014, in state_set
2017-01-12 11:42:36.677391 | self._add_event(action, status, reason)
2017-01-12 11:42:36.677427 | File "/home/jenkins/workspace/gate-heat-python35-db/heat/engine/resource.py", line 1764, in _add_event
2017-01-12 11:42:36.677438 | ev.store()
2017-01-12 11:42:36.677463 | File "/home/jenkins/workspace/gate-heat-python35-db/heat/engine/event.py", line 102, in store
2017-01-12 11:42:36.677480 | new_ev = event_object.Event.create(self.context, ev)
2017-01-12 11:42:36.677506 | File "/home/jenkins/workspace/gate-heat-python35-db/heat/objects/event.py", line 83, in create
2017-01-12 11:42:36.677519 | db_api.event_create(context, values))
2017-01-12 11:42:36.677547 | File "/home/jenkins/workspace/gate-heat-python35-db/heat/db/sqlalchemy/api.py", line 941, in event_create
2017-01-12 11:42:36.677560 | cfg.CONF.max_events_per_stack)):
2017-01-12 11:42:36.677576 | TypeError: unorderable types: MagicMock() >= int()

Noticed at:

http://logs.openstack.org/85/419385/1/check/gate-heat-python35-db/0bf4ae8/console.html#_2017-01-12_11_42_36_677576

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/419786

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/419786
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=3227b1d90727855e760dd901af06076ad3f3dab2
Submitter: Jenkins
Branch: master

commit 3227b1d90727855e760dd901af06076ad3f3dab2
Author: rabi <email address hidden>
Date: Thu Jan 12 18:43:39 2017 +0530

    Don't use MagicMock for stacks in tests

    Change-Id: I1ac42a3057dea4d6a19b7e6d73cf1152a0b6ba7d
    Closes-Bug: #1656190

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/newton
Review: https://review.openstack.org/424883

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/heat 8.0.0.0b3 development milestone.

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/424883
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=e83c1a419a64a1d0abd63674cfc1d27f66b31830
Submitter: Jenkins
Branch: stable/newton

commit e83c1a419a64a1d0abd63674cfc1d27f66b31830
Author: rabi <email address hidden>
Date: Thu Jan 12 18:43:39 2017 +0530

    Don't use MagicMock for stacks in tests

    Conflict resolution was required because the test_needs_replace_failed
    test doesn't exist on this branch

    Change-Id: I1ac42a3057dea4d6a19b7e6d73cf1152a0b6ba7d
    Closes-Bug: #1656190
    (cherry picked from commit 3227b1d90727855e760dd901af06076ad3f3dab2)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/heat 7.0.4 release.