Revision e8234183 snf-cyclades-app/synnefo/logic/tests/servers.py

b/snf-cyclades-app/synnefo/logic/tests/servers.py
125 125
            vm = mfactory.VirtualMachineFactory(operstate="STARTED")
126 126
            mfactory.BackendNetworkFactory(network=net, backend=vm.backend)
127 127
            mrapi().ModifyInstance.return_value = 42
128
            servers.connect(vm, net)
128
            with override_settings(settings, GANETI_USE_HOTPLUG=True):
129
                servers.connect(vm, net)
129 130
            pool = net.get_ip_pools(locked=False)[0]
130 131
            self.assertFalse(pool.is_available("192.168.2.2"))
131 132
            args, kwargs = mrapi().ModifyInstance.call_args
......
142 143
                                            gateway="2000::1")
143 144
        net = subnet.network
144 145
        mfactory.BackendNetworkFactory(network=net, backend=vm.backend)
145
        servers.connect(vm, net)
146
        with override_settings(settings, GANETI_USE_HOTPLUG=True):
147
            servers.connect(vm, net)
146 148
        args, kwargs = mrapi().ModifyInstance.call_args
147 149
        nics = kwargs["nics"][0]
148 150
        self.assertEqual(kwargs["instance"], vm.backend_vm_id)
......
208 210
        serial = vm.serial
209 211
        mrapi().StartupInstance.return_value = 1
210 212
        with mocked_quotaholder() as m:
211
            servers.start(vm)
213
            with override_settings(settings, CYCLADES_SERVICE_TOKEN=''):
214
                servers.start(vm)
212 215
            m.resolve_commissions.assert_called_once_with('', [],
213 216
                                                          [serial.serial])
214 217
            self.assertTrue(m.issue_one_commission.called)
......
221 224
        serial = vm.serial
222 225
        mrapi().StartupInstance.return_value = 1
223 226
        with mocked_quotaholder() as m:
224
            servers.start(vm)
227
            with override_settings(settings, CYCLADES_SERVICE_TOKEN=''):
228
                servers.start(vm)
225 229
            m.resolve_commissions.assert_called_once_with('', [],
226 230
                                                          [serial.serial])
227 231
            self.assertTrue(m.issue_one_commission.called)
......
234 238
        serial = vm.serial
235 239
        mrapi().StartupInstance.return_value = 1
236 240
        with mocked_quotaholder() as m:
237
            servers.start(vm)
241
            with override_settings(settings, CYCLADES_SERVICE_TOKEN=''):
242
                servers.start(vm)
238 243
            m.resolve_commissions.assert_called_once_with('', [serial.serial],
239 244
                                                          [])
240 245
            self.assertTrue(m.issue_one_commission.called)
......
244 249
        vm.serial = None
245 250
        # Test reject if Ganeti erro
246 251
        with mocked_quotaholder() as m:
247
            try:
248
                servers.start(vm)
249
            except:
250
                m.resolve_commissions\
251
                 .assert_called_once_with('', [], [vm.serial.serial])
252
            with override_settings(settings, CYCLADES_SERVICE_TOKEN=''):
253
                try:
254
                    servers.start(vm)
255
                except:
256
                    m.resolve_commissions\
257
                     .assert_called_once_with('', [], [vm.serial.serial])
252 258

  
253 259
    def test_task_after(self, mrapi):
254 260
        return

Also available in: Unified diff