← Back to branch summary

~ubuntu-branches/ubuntu/precise/nova/precise-updates

« back to all changes in this revision

Viewing changes to nova/tests/rpc/test_qpid.py

  • Committer: Package Import Robot
  • Author(s): Adam Gandelman
  • Date: 2012-08-27 14:50:40 UTC
  • mfrom: (79.1.3 precise-proposed)
  • Revision ID: package-import@ubuntu.com-20120827145040-vlkdab5i0smvnhei
Tags: 2012.1.3+stable-20120827-4d2a4afe-0ubuntu1
https://launchpad.net/bugs/1041120
https://launchpad.net/bugs/917615
https://launchpad.net/bugs/1038266
* New upstream snapshot, fixes FTBFS in -proposed. (LP: #1041120)
* Resynchronize with stable/essex (4d2a4afe):
  - [5d63601] Inappropriate exception handling on kvm live/block migration
    (LP: #917615)
  - [ae280ca] Deleted floating ips can cause instance delete to fail
    (LP: #1038266)

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/rpc/test_qpid.py
265
265
                                                        self.mock_receiver)
266
266
        self.mock_receiver.fetch().AndReturn(qpid.messaging.Message(
267
267
                        {"result": "foo", "failure": False, "ending": False}))
 
268
        self.mock_session.acknowledge(mox.IgnoreArg())
268
269
        if multi:
269
270
            self.mock_session.next_receiver(timeout=mox.IsA(int)).AndReturn(
270
271
                                                        self.mock_receiver)
272
273
                            qpid.messaging.Message(
273
274
                                {"result": "bar", "failure": False,
274
275
                                 "ending": False}))
 
276
            self.mock_session.acknowledge(mox.IgnoreArg())
275
277
            self.mock_session.next_receiver(timeout=mox.IsA(int)).AndReturn(
276
278
                                                        self.mock_receiver)
277
279
            self.mock_receiver.fetch().AndReturn(
278
280
                            qpid.messaging.Message(
279
281
                                {"result": "baz", "failure": False,
280
282
                                 "ending": False}))
 
283
            self.mock_session.acknowledge(mox.IgnoreArg())
281
284
        self.mock_session.next_receiver(timeout=mox.IsA(int)).AndReturn(
282
285
                                                        self.mock_receiver)
283
286
        self.mock_receiver.fetch().AndReturn(qpid.messaging.Message(
284
287
                        {"failure": False, "ending": True}))
 
288
        self.mock_session.acknowledge(mox.IgnoreArg())
285
289
        self.mock_session.close()
286
290
        self.mock_connection.session().AndReturn(self.mock_session)
287
291