← Back to branch summary

~ubuntu-branches/ubuntu/raring/nova/raring-proposed

« back to all changes in this revision

Viewing changes to nova/tests/consoleauth/test_rpcapi.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Adam Gandelman, Chuck Short
  • Date: 2012-11-23 09:04:58 UTC
  • mfrom: (1.1.66)
  • Revision ID: package-import@ubuntu.com-20121123090458-91565o7aev1i1h71
Tags: 2013.1~g1-0ubuntu1
https://launchpad.net/bugs/1073289
https://launchpad.net/bugs/1076442
[ Adam Gandelman ]
* debian/control: Ensure novaclient is upgraded with nova,
  require python-keystoneclient >= 1:2.9.0. (LP: #1073289)
* debian/patches/{ubuntu/*, rbd-security.patch}: Dropped, applied
  upstream.
* debian/control: Add python-testtools to Build-Depends.

[ Chuck Short ]
* New upstream version.
* Refreshed debian/patches/avoid_setuptools_git_dependency.patch.
* debian/rules: FTBFS if missing binaries.
* debian/nova-scheudler.install: Add missing rabbit-queues and
  nova-rpc-zmq-receiver.
* Remove nova-volume since it doesnt exist anymore, transition to cinder-*.
* debian/rules: install apport hook in the right place.
* debian/patches/ubuntu-show-tests.patch: Display test failures.
* debian/control: Add depends on genisoimage
* debian/control: Suggest guestmount.
* debian/control: Suggest websockify. (LP: #1076442)
* debian/nova.conf: Disable nova-volume service.
* debian/control: Depend on xen-system-* rather than the hypervisor.
* debian/control, debian/mans/nova-conductor.8, debian/nova-conductor.init,
  debian/nova-conductor.install, debian/nova-conductor.logrotate
  debian/nova-conductor.manpages, debian/nova-conductor.postrm
  debian/nova-conductor.upstart.in: Add nova-conductor service.
* debian/control: Add python-fixtures as a build deps.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/consoleauth/test_rpcapi.py
20
20
 
21
21
from nova.consoleauth import rpcapi as consoleauth_rpcapi
22
22
from nova import context
23
 
from nova import flags
 
23
from nova.openstack.common import cfg
24
24
from nova.openstack.common import rpc
25
25
from nova import test
26
26
 
27
 
 
28
 
FLAGS = flags.FLAGS
 
27
CONF = cfg.CONF
29
28
 
30
29
 
31
30
class ConsoleAuthRpcAPITestCase(test.TestCase):
32
 
 
33
 
    def setUp(self):
34
 
        super(ConsoleAuthRpcAPITestCase, self).setUp()
35
 
 
36
 
    def tearDown(self):
37
 
        super(ConsoleAuthRpcAPITestCase, self).tearDown()
38
 
 
39
31
    def _test_consoleauth_api(self, method, **kwargs):
40
32
        ctxt = context.RequestContext('fake_user', 'fake_project')
41
33
        rpcapi = consoleauth_rpcapi.ConsoleAuthAPI()
61
53
 
62
54
        self.assertEqual(retval, expected_retval)
63
55
        self.assertEqual(self.call_ctxt, ctxt)
64
 
        self.assertEqual(self.call_topic, FLAGS.consoleauth_topic)
 
56
        self.assertEqual(self.call_topic, CONF.consoleauth_topic)
65
57
        self.assertEqual(self.call_msg, expected_msg)
66
58
        self.assertEqual(self.call_timeout, None)
67
59