Revision 5962d9a6 snf-cyclades-app/synnefo/logic/tests.py

b/snf-cyclades-app/synnefo/logic/tests.py
139 139
            try:
140 140
                servers.start(vm)
141 141
            except:
142
                m.resolve_commissions.assert_called_once_with('', [],
143
                                                            [vm.serial.serial])
142
                m.resolve_commissions\
143
                 .assert_called_once_with('', [], [vm.serial.serial])
144 144

  
145 145
    def test_task_after(self, mrapi):
146 146
        return
......
148 148
        mrapi().StartupInstance.return_value = 1
149 149
        mrapi().ShutdownInstance.return_value = 2
150 150
        mrapi().RebootInstance.return_value = 2
151
        with mocked_quotaholder() as m:
151
        with mocked_quotaholder():
152 152
            vm.task = None
153 153
            vm.operstate = "STOPPED"
154 154
            servers.start(vm)
155 155
            self.assertEqual(vm.task, "START")
156 156
            self.assertEqual(vm.task_job_id, 1)
157
        with mocked_quotaholder() as m:
157
        with mocked_quotaholder():
158 158
            vm.task = None
159 159
            vm.operstate = "STARTED"
160 160
            servers.stop(vm)
161 161
            self.assertEqual(vm.task, "STOP")
162 162
            self.assertEqual(vm.task_job_id, 2)
163
        with mocked_quotaholder() as m:
163
        with mocked_quotaholder():
164 164
            vm.task = None
165 165
            servers.reboot(vm)
166 166
            self.assertEqual(vm.task, "REBOOT")
167 167
            self.assertEqual(vm.task_job_id, 3)
168 168

  
169 169

  
170

  
171 170
## Test Callbacks
172

  
173

  
174 171
@patch('synnefo.lib.amqp.AMQPClient')
175 172
class UpdateDBTest(TestCase):
176 173
    def create_msg(self, **kwargs):
......
272 269
        fp1 = mfactory.FloatingIPFactory(machine=vm2, network=network)
273 270
        fp2 = mfactory.FloatingIPFactory(machine=vm2, network=network)
274 271
        mfactory.NetworkInterfaceFactory(machine=vm2, network=network,
275
                ipv4=fp1.ipv4)
272
                                         ipv4=fp1.ipv4)
276 273
        mfactory.NetworkInterfaceFactory(machine=vm2, network=network,
277
                ipv4=fp2.ipv4)
274
                                         ipv4=fp2.ipv4)
278 275
        pool = network.get_pool()
279 276
        pool.reserve(fp1.ipv4)
280 277
        pool.reserve(fp2.ipv4)
......
461 458
    def test_empty_nic(self, client):
462 459
        vm = mfactory.VirtualMachineFactory(operstate='ERROR')
463 460
        for public in [True, False]:
464
            net = mfactory.NetworkFactory(public=public)
461
            net = mfactory.NetworkFactory(public=public, subnet6=None)
465 462
            msg = self.create_msg(nics=[{'network': net.backend_id}],
466 463
                                  instance=vm.backend_vm_id)
467 464
            update_db(client, msg)
......
481 478

  
482 479
    def test_full_nic(self, client):
483 480
        vm = mfactory.VirtualMachineFactory(operstate='ERROR')
484
        net = mfactory.NetworkFactory(subnet='10.0.0.0/24')
481
        net = mfactory.NetworkFactory(subnet='10.0.0.0/24', subnet6=None)
485 482
        pool = net.get_pool()
486 483
        self.assertTrue(pool.is_available('10.0.0.22'))
487 484
        pool.save()
......
573 570
        """Test network creation when a backend is offline"""
574 571
        net = mfactory.NetworkFactory(state='ACTIVE')
575 572
        bn1 = mfactory.BackendNetworkFactory(network=net)
576
        bn2 = mfactory.BackendNetworkFactory(network=net,
577
                                             backend__offline=True)
573
        mfactory.BackendNetworkFactory(network=net,
574
                                       backend__offline=True)
578 575
        msg = self.create_msg(operation='OP_NETWORK_CONNECT',
579 576
                              network=net.backend_id,
580 577
                              cluster=bn1.backend.clustername)
......
889 886
             "nic.networks": [],
890 887
             "tags": []}]
891 888
        self.reconciler.reconcile()
892
        cmrapi.DeleteInstance.assert_called_once_with(
893
                "%s22" % settings.BACKEND_PREFIX_ID)
889
        cmrapi.DeleteInstance\
890
              .assert_called_once_with("%s22" % settings.BACKEND_PREFIX_ID)
894 891

  
895 892
    def test_unsynced_operstate(self, mrapi):
896 893
        vm1 = mfactory.VirtualMachineFactory(backend=self.backend,
......
972 969

  
973 970
from synnefo.logic.test.rapi_pool_tests import *
974 971
from synnefo.logic.test.utils_tests import *
972
from synnefo.logic.test.networks import *
973
from synnefo.logic.test.servers import *

Also available in: Unified diff