← Back to branch summary

~ubuntu-branches/ubuntu/vivid/horizon/vivid-proposed

« back to all changes in this revision

Viewing changes to openstack_dashboard/test/api_tests/nova_tests.py

  • Committer: Package Import Robot
  • Author(s): Corey Bryant, Chuck Short, Corey Bryant, James Page
  • Date: 2015-01-05 16:42:06 UTC
  • mfrom: (0.9.1) (1.2.5)
  • Revision ID: package-import@ubuntu.com-20150105164206-zrt2q64h4weugkur
Tags: 1:2015.1~b1-0ubuntu1
[ Chuck Short ]
* Open for Kilo.
* d/control: Update bzr branches 
* d/patches/embedded-xstatic.patch: Refreshed
* d/patches/add-juju-environment-download.patch: Temporarily disabled.

[ Corey Bryant ]
* New upstream release.
  - d/control: Align requirements with upstream.
  - d/watch: Update uversionmangle for kilo beta naming.
* d/control: Bumped Standards-Version to 3.9.6.

[ James Page ]
* d/bundle-xstatic.sh: Tweak grep to be case insensitive.
* d/p/add-juju-environment-download.patch: Rebase for kilo-1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
openstack_dashboard/test/api_tests/nova_tests.py
114
114
        novaclient = self.stub_novaclient()
115
115
        novaclient.servers = self.mox.CreateMockAnything()
116
116
        novaclient.servers.get_rdp_console(server.id,
117
 
                                             console_type).AndReturn(console)
 
117
                                           console_type).AndReturn(console)
118
118
        self.mox.ReplayAll()
119
119
 
120
120
        ret_val = api.nova.server_rdp_console(self.request,
121
 
                                                server.id,
122
 
                                                console_type)
 
121
                                              server.id,
 
122
                                              console_type)
123
123
        self.assertIsInstance(ret_val, api.nova.RDPConsole)
124
124
 
125
125
    def test_server_list(self):