test_rabbit.TestRacyWaitForReply failed with a not related change

[Attila Fazekas]

http://logs.openstack.org/62/74662/1/gate/gate-oslo.messaging-python27/2f5820f/console.html.gz

FAIL: tests.test_rabbit.TestRacyWaitForReply.test_send_receive

 Exception in thread Thread-18:
 Traceback (most recent call last):
   File "/usr/lib/python2.7/threading.py", line 551, in __bootstrap_inner
     self.run()
   File "/usr/lib/python2.7/threading.py", line 504, in run
     self.__target(*self.__args, **self.__kwargs)
   File "/home/jenkins/workspace/gate-oslo.messaging-python27/tests/test_rabbit.py", line 291, in send_and_wait_for_reply
     timeout=None))
   File "/home/jenkins/workspace/gate-oslo.messaging-python27/.tox/py27/local/lib/python2.7/site-packages/oslo/messaging/_drivers/amqpdriver.py", line 393, in send
     return self._send(target, ctxt, message, wait_for_reply, timeout)
   File "/home/jenkins/workspace/gate-oslo.messaging-python27/.tox/py27/local/lib/python2.7/site-packages/oslo/messaging/_drivers/amqpdriver.py", line 384, in _send
     result = self._waiter.wait(msg_id, timeout)
   File "/home/jenkins/workspace/gate-oslo.messaging-python27/tests/test_rabbit.py", line 281, in reply_waiter
     wait_conditions.pop().wait()
 IndexError: pop from empty list

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

[Numan Siddique (numansiddique)]

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

This is the proper one

[Mark McLoughlin (markmc)]

This is a race condition only with the unit tests. From the proposed fix:

 # The bug 1283926 is because, 2 threads are created
 # and both of them try to pop from 'wait_conditions'.
 # Since there is no synchronization it is possible
 # that both the threads could try to pop at the same time.
 #
 # Since the test case intents only thread 0 to wait for the
 # notification, make sure that only thread 0 pops the
 # wait_conditions

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/75838
Committed: https://git.openstack.org/cgit/openstack/oslo.messaging/commit/?id=076db925c8625b384b3fea13ffc9dc107643bd58
Submitter: Jenkins
Branch: master

commit 076db925c8625b384b3fea13ffc9dc107643bd58
Author: Numan Siddique <email address hidden>
Date: Mon Feb 24 16:29:35 2014 +0530

    Fixed the issue for pop exception

    Fixed the issue so that two
    threads do not pop the list at the same time
    Closes-Bug: #1283926
    Change-Id: I693407495c18c3e4a0ca2d8d94c4f4ed179371bf

[Matt Riedemann (mriedem)]

Also need this on stable/icehouse:

http://logs.openstack.org/72/94972/1/gate/gate-oslo.messaging-python27/d5a3408/console.html

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/icehouse
Review: https://review.openstack.org/98242

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/98242
Committed: https://git.openstack.org/cgit/openstack/oslo.messaging/commit/?id=e0933b4258417f2fcd945948f64217fc7a11ea8f
Submitter: Jenkins
Branch: stable/icehouse

commit e0933b4258417f2fcd945948f64217fc7a11ea8f
Author: Numan Siddique <email address hidden>
Date: Mon Feb 24 16:29:35 2014 +0530

    Fixed the issue for pop exception

    Fixed the issue so that two
    threads do not pop the list at the same time
    Closes-Bug: #1283926
    Change-Id: I693407495c18c3e4a0ca2d8d94c4f4ed179371bf
    (cherry picked from commit 076db925c8625b384b3fea13ffc9dc107643bd58)