Merge trunk.

This commit is contained in:
Todd Willey
2011-01-07 09:46:17 -05:00
112 changed files with 140 additions and 808 deletions

View File

@@ -21,7 +21,7 @@ Unit Tests for remote procedure calls using queue
from nova import context
from nova import flags
from nova import logging
from nova import log as logging
from nova import rpc
from nova import test
@@ -86,12 +86,12 @@ class RpcTestCase(test.TestCase):
@staticmethod
def echo(context, queue, value):
"""Calls echo in the passed queue"""
logging.debug("Nested received %s, %s", queue, value)
LOG.debug(_("Nested received %s, %s"), queue, value)
ret = rpc.call(context,
queue,
{"method": "echo",
"args": {"value": value}})
logging.debug("Nested return %s", ret)
LOG.debug(_("Nested return %s"), ret)
return value
nested = Nested()