← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/tests/api/openstack/compute/test_consoles.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/api/openstack/compute/test_consoles.py
17
17
#    under the License.
18
18
 
19
19
import datetime
 
20
import uuid as stdlib_uuid
20
21
 
21
22
from lxml import etree
22
23
import webob
26
27
from nova import console
27
28
from nova import db
28
29
from nova import exception
29
 
from nova import flags
30
30
from nova.openstack.common import timeutils
31
31
from nova import test
32
32
from nova.tests.api.openstack import fakes
33
 
from nova import utils
34
 
 
35
 
 
36
 
FLAGS = flags.FLAGS
 
33
from nova.tests import matchers
 
34
 
 
35
 
37
36
FAKE_UUID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
38
37
 
39
38
 
58
57
        if id is None:
59
58
            id = self.max_id + 1
60
59
        if uuid is None:
61
 
            uuid = str(utils.gen_uuid())
 
60
            uuid = str(stdlib_uuid.uuid4())
62
61
        instance = stub_instance(id, uuid=uuid)
63
62
        self.instances_by_id[id] = instance
64
63
        self.ids_by_uuid[uuid] = id
134
133
                       self.instance_db.return_server_by_id)
135
134
        self.stubs.Set(db, 'instance_get_by_uuid',
136
135
                       self.instance_db.return_server_by_uuid)
137
 
        self.uuid = str(utils.gen_uuid())
 
136
        self.uuid = str(stdlib_uuid.uuid4())
138
137
        self.url = '/v2/fake/servers/%s/consoles' % self.uuid
139
138
        self.controller = consoles.Controller()
140
139
 
167
166
 
168
167
        req = fakes.HTTPRequest.blank(self.url + '/20')
169
168
        res_dict = self.controller.show(req, self.uuid, '20')
170
 
        self.assertDictMatch(res_dict, expected)
 
169
        self.assertThat(res_dict, matchers.DictMatches(expected))
171
170
 
172
171
    def test_show_console_unknown_console(self):
173
172
        def fake_get_console(cons_self, context, instance_id, console_id):
211
210
 
212
211
        req = fakes.HTTPRequest.blank(self.url)
213
212
        res_dict = self.controller.index(req, self.uuid)
214
 
        self.assertDictMatch(res_dict, expected)
 
213
        self.assertThat(res_dict, matchers.DictMatches(expected))
215
214
 
216
215
    def test_delete_console(self):
217
216
        def fake_get_console(cons_self, context, instance_id, console_id):