Revision 184a2a8c
b/snf-cyclades-app/synnefo/api/test/images.py | ||
---|---|---|
46 | 46 |
def wrapper(self, backend): |
47 | 47 |
result = func(self, backend) |
48 | 48 |
if backend.called is True: |
49 |
backend.return_value.close.assert_called_once_with()
|
|
49 |
backend.return_value.close.asssert_called
|
|
50 | 50 |
return result |
51 | 51 |
return wrapper |
52 | 52 |
|
b/snf-cyclades-app/synnefo/api/test/networks.py | ||
---|---|---|
34 | 34 |
import json |
35 | 35 |
from mock import patch |
36 | 36 |
|
37 |
from snf_django.utils.testing import BaseAPITest |
|
37 |
from snf_django.utils.testing import BaseAPITest, mocked_quotaholder
|
|
38 | 38 |
from synnefo.db.models import Network, NetworkInterface |
39 | 39 |
from synnefo.db import models_factory as mfactory |
40 | 40 |
|
... | ... | |
74 | 74 |
request = { |
75 | 75 |
'network': {'name': 'foo', "type": "MAC_FILTERED"} |
76 | 76 |
} |
77 |
response = self.post('/api/v1.1/networks/', 'user1', |
|
78 |
json.dumps(request), 'json') |
|
77 |
with mocked_quotaholder(): |
|
78 |
response = self.post('/api/v1.1/networks/', 'user1', |
|
79 |
json.dumps(request), 'json') |
|
79 | 80 |
self.assertEqual(response.status_code, 202) |
80 | 81 |
db_networks = Network.objects.filter(userid='user1') |
81 | 82 |
self.assertEqual(len(db_networks), 1) |
b/snf-cyclades-app/synnefo/api/test/servers.py | ||
---|---|---|
33 | 33 |
|
34 | 34 |
import json |
35 | 35 |
|
36 |
from snf_django.utils.testing import BaseAPITest |
|
36 |
from snf_django.utils.testing import BaseAPITest, mocked_quotaholder
|
|
37 | 37 |
from synnefo.db.models import VirtualMachine, VirtualMachineMetadata |
38 | 38 |
from synnefo.db import models_factory as mfactory |
39 | 39 |
from synnefo.logic.utils import get_rsapi_state |
... | ... | |
192 | 192 |
"personality": [] |
193 | 193 |
} |
194 | 194 |
} |
195 |
response = self.post('/api/v1.1/servers', 'test_user', |
|
196 |
json.dumps(request), 'json') |
|
195 |
with mocked_quotaholder(): |
|
196 |
response = self.post('/api/v1.1/servers', 'test_user', |
|
197 |
json.dumps(request), 'json') |
|
197 | 198 |
self.assertEqual(response.status_code, 202) |
198 | 199 |
mrapi().CreateInstance.assert_called_once() |
199 | 200 |
|
b/snf-cyclades-app/synnefo/logic/tests.py | ||
---|---|---|
43 | 43 |
from synnefo.api.util import allocate_resource |
44 | 44 |
from synnefo.logic.callbacks import (update_db, update_net, update_network, |
45 | 45 |
update_build_progress) |
46 |
from snf_django.utils.testing import mocked_quotaholder |
|
46 | 47 |
|
47 | 48 |
now = datetime.now |
48 | 49 |
from time import time |
... | ... | |
135 | 136 |
mfactory.NetworkInterfaceFactory(machine=vm) |
136 | 137 |
msg = self.create_msg(operation='OP_INSTANCE_REMOVE', |
137 | 138 |
instance=vm.backend_vm_id) |
138 |
update_db(client, msg) |
|
139 |
with mocked_quotaholder(): |
|
140 |
update_db(client, msg) |
|
139 | 141 |
client.basic_ack.assert_called_once() |
140 | 142 |
db_vm = VirtualMachine.objects.get(id=vm.id) |
141 | 143 |
self.assertEqual(db_vm.operstate, 'DESTROYED') |
... | ... | |
170 | 172 |
mfactory.NetworkInterfaceFactory(machine=vm) |
171 | 173 |
msg = self.create_msg(operation='OP_INSTANCE_REMOVE', |
172 | 174 |
instance=vm.backend_vm_id) |
173 |
update_db(client, msg) |
|
175 |
with mocked_quotaholder(): |
|
176 |
update_db(client, msg) |
|
174 | 177 |
client.basic_ack.assert_called_once() |
175 | 178 |
db_vm = VirtualMachine.objects.get(id=vm.id) |
176 | 179 |
self.assertEqual(db_vm.operstate, 'DESTROYED') |
... | ... | |
395 | 398 |
msg = self.create_msg(operation='OP_NETWORK_REMOVE', |
396 | 399 |
network=net.backend_id, |
397 | 400 |
cluster=bn.backend.clustername) |
398 |
update_network(client, msg) |
|
401 |
with mocked_quotaholder(): |
|
402 |
update_network(client, msg) |
|
399 | 403 |
client.basic_ack.assert_called_once() |
400 | 404 |
db_bnet = BackendNetwork.objects.get(id=bn.id) |
401 | 405 |
self.assertEqual(db_bnet.operstate, |
... | ... | |
422 | 426 |
msg = self.create_msg(operation='OP_NETWORK_REMOVE', |
423 | 427 |
network=net.backend_id, |
424 | 428 |
cluster=bn1.backend.clustername) |
425 |
update_network(client, msg) |
|
429 |
with mocked_quotaholder(): |
|
430 |
update_network(client, msg) |
|
426 | 431 |
client.basic_ack.assert_called_once() |
427 | 432 |
new_net = Network.objects.get(id=net.id) |
428 | 433 |
self.assertEqual(new_net.state, 'DELETED') |
b/snf-cyclades-app/synnefo/quotas/tests.py | ||
---|---|---|
78 | 78 |
def setUp(self): |
79 | 79 |
self.p1 = mfactory.QuotaHolderSerialFactory(serial=20, pending=True) |
80 | 80 |
self.p1 = mfactory.QuotaHolderSerialFactory(serial=30, pending=True) |
81 |
self.a1 = mfactory.QuotaHolderSerialFactory(serial=15, accepted=True) |
|
82 |
self.a2 = mfactory.QuotaHolderSerialFactory(serial=25, accepted=True) |
|
83 |
self.r1 = mfactory.QuotaHolderSerialFactory(serial=18, rejected=True) |
|
84 |
self.r2 = mfactory.QuotaHolderSerialFactory(serial=23, rejected=True) |
|
81 |
self.a1 = mfactory.QuotaHolderSerialFactory(serial=15, pending=False, |
|
82 |
accept=True) |
|
83 |
self.a2 = mfactory.QuotaHolderSerialFactory(serial=25, pending=False, |
|
84 |
accept=True) |
|
85 |
self.r1 = mfactory.QuotaHolderSerialFactory(serial=18, pending=False, |
|
86 |
accept=False) |
|
87 |
self.r2 = mfactory.QuotaHolderSerialFactory(serial=23, pending=False, |
|
88 |
accept=False) |
|
85 | 89 |
|
86 | 90 |
def test_no_pending(self, qh): |
87 | 91 |
qh.return_value = [] |
b/snf-django-lib/snf_django/utils/testing.py | ||
---|---|---|
133 | 133 |
m.return_value = {"uuid": user} |
134 | 134 |
yield |
135 | 135 |
|
136 |
serial = 0 |
|
137 |
|
|
138 |
|
|
139 |
@contextmanager |
|
140 |
def mocked_quotaholder(success=True): |
|
141 |
with patch("synnefo.quotas.Quotaholder") as astakos: |
|
142 |
global serial |
|
143 |
serial += 1 |
|
144 |
astakos.get.return_value.issue_one_commission.return_value = serial |
|
145 |
yield |
|
146 |
|
|
136 | 147 |
|
137 | 148 |
class BaseAPITest(TestCase): |
138 | 149 |
def get(self, url, user='user', *args, **kwargs): |
Also available in: Unified diff