← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nova/quantal-security

« back to all changes in this revision

Viewing changes to nova/tests/network/test_manager.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2012-06-22 12:39:57 UTC
  • mfrom: (1.1.57)
  • Revision ID: package-import@ubuntu.com-20120622123957-hbzwg84nt9rqwg8r
Tags: 2012.2~f2~20120621.14517-0ubuntu1
[ Chuck Short ]
* New upstream version.

[ Adam Gandelman ]
* debian/rules: Temporarily disable test suite while blocking
  tests are investigated. 
* debian/patches/kombu_tests_timeout.patch: Dropped.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/network/test_manager.py
23
23
from nova import context
24
24
from nova import db
25
25
from nova import exception
26
 
from nova import flags
27
26
from nova import log as logging
28
27
from nova.network import linux_net
29
28
from nova.network import manager as network_manager
30
29
from nova.openstack.common import importutils
 
30
from nova.openstack.common import rpc
31
31
import nova.policy
32
 
from nova import rpc
33
32
from nova import test
34
33
from nova.tests import fake_network
35
34
from nova import utils
700
699
        self.local = True
701
700
        self.stubs.Set(self.network.db, 'fixed_ip_get_by_address', fake4)
702
701
        self.stubs.Set(self.network.db, 'network_get', fake4_network)
703
 
        self.stubs.Set(rpc, 'cast', fake6)
 
702
        self.stubs.Set(rpc, 'call', fake6)
704
703
        self.network.associate_floating_ip(ctxt, mox.IgnoreArg(),
705
704
                                                 mox.IgnoreArg())
706
705
        self.assertFalse(self.local)
818
817
        self.local = True
819
818
        self.stubs.Set(self.network.db, 'fixed_ip_get', fake4)
820
819
        self.stubs.Set(self.network.db, 'network_get', fake4_network)
821
 
        self.stubs.Set(rpc, 'cast', fake6)
 
820
        self.stubs.Set(rpc, 'call', fake6)
822
821
        self.network.disassociate_floating_ip(ctxt, mox.IgnoreArg())
823
822
        self.assertFalse(self.local)
824
823