Revision 656cf771 snf-cyclades-app/synnefo/quotas/tests.py

b/snf-cyclades-app/synnefo/quotas/tests.py
46 46

  
47 47
class GetDBHoldingsTestCase(TestCase):
48 48
    def test_no_holdings(self):
49
        users = ["dummy_user1", "dummy_user2"]
50
        holdings = util.get_db_holdings(users=users)
49
        holdings = util.get_db_holdings(user=None)
51 50
        self.assertEqual(holdings, {})
52 51

  
53 52
    def test_vm_holdings(self):
......
55 54
                                  disk_template='drbd')
56 55
        mfactory.VirtualMachineFactory()
57 56
        mfactory.VirtualMachineFactory(flavor=flavor, userid="user1")
58
        user_holdings = {"user1": {"vm": 1,
59
                                   "cpu": 24,
60
                                   "disk": 21474836480,
61
                                   "ram": 8589934592}}
62
        holdings = util.get_db_holdings(users=["user1"])
57
        user_holdings = {"user1": {"cyclades.vm": 1,
58
                                   "cyclades.cpu": 24,
59
                                   "cyclades.disk": 21474836480,
60
                                   "cyclades.ram": 8589934592}}
61
        holdings = util.get_db_holdings(user="user1")
63 62
        self.assertEqual(holdings, user_holdings)
64 63
        holdings = util.get_db_holdings()
65 64
        self.assertEqual(holdings["user1"], user_holdings["user1"])
......
67 66
    def test_network_holdings(self):
68 67
        mfactory.NetworkFactory(userid="user1")
69 68
        mfactory.NetworkFactory(userid="user2")
70
        user_holdings = {"user2": {"network.private": 1}}
71
        holdings = util.get_db_holdings(users=["user2"])
69
        user_holdings = {"user2": {"cyclades.network.private": 1}}
70
        holdings = util.get_db_holdings(user="user2")
72 71
        self.assertEqual(holdings, user_holdings)
73 72
        holdings = util.get_db_holdings()
74 73
        self.assertEqual(holdings["user2"], user_holdings["user2"])

Also available in: Unified diff