← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/tests/baremetal/db/test_bm_pxe_ip.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, James Page
  • Date: 2013-03-20 12:59:22 UTC
  • mfrom: (1.1.69)
  • Revision ID: package-import@ubuntu.com-20130320125922-ohvfav96lemn9wlz
Tags: 1:2013.1~rc1-0ubuntu1
[ Chuck Short ]
* New upstream release.
* debian/patches/avoid_setuptools_git_dependency.patch: Refreshed.
* debian/control: Clean up dependencies:
  - Dropped python-gflags no longer needed.
  - Dropped python-daemon no longer needed.
  - Dropped python-glance no longer needed.
  - Dropped python-lockfile no longer needed.
  - Dropped python-simplejson no longer needed.
  - Dropped python-tempita no longer needed.
  - Dropped python-xattr no longer needed.
  - Add sqlite3 required for the testsuite.

[ James Page ]
* d/watch: Update uversionmangle to deal with upstream versioning
  changes, remove tarballs.openstack.org. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/baremetal/db/test_bm_pxe_ip.py
18
18
"""
19
19
 
20
20
from nova import exception
21
 
from nova.openstack.common.db.sqlalchemy import session as db_session
 
21
from nova.openstack.common.db import exception as db_exc
22
22
from nova.tests.baremetal.db import base
23
23
from nova.tests.baremetal.db import utils
24
24
from nova.virt.baremetal import db
51
51
        # address duplicates
52
52
        i = utils.new_bm_pxe_ip(address='10.1.1.1',
53
53
                                server_address='10.1.1.201')
54
 
        self.assertRaises(db_session.DBError,
 
54
        self.assertRaises(db_exc.DBError,
55
55
                          db.bm_pxe_ip_create_direct,
56
56
                          self.context, i)
57
57
 
58
58
        # server_address duplicates
59
59
        i = utils.new_bm_pxe_ip(address='10.1.1.3',
60
60
                                server_address='10.1.1.101')
61
 
        self.assertRaises(db_session.DBError,
 
61
        self.assertRaises(db_exc.DBError,
62
62
                          db.bm_pxe_ip_create_direct,
63
63
                          self.context, i)
64
64