Commit 8992fbe6 authored by Giorgos Korfiatis's avatar Giorgos Korfiatis

Merge two tests for quotaholder api

parent 87a52574
......@@ -214,7 +214,7 @@ class QHAPITest(QHTestCase):
self.assertEqual(r, [])
return limits
def test_009_issue_commission(self):
def test_009_commissions(self):
e0, k0 = self.new_entity()
e1, k1 = self.new_entity()
resource = self.rand_resource()
......@@ -232,6 +232,13 @@ class QHAPITest(QHTestCase):
name='something',
provisions=[(e1, resource, 1)])
r = self.qh.get_pending_commissions(clientkey=self.client)
self.assertEqual(r, [1])
r = self.qh.resolve_pending_commissions(clientkey=self.client,
max_serial=1, accept_set=[1])
r = self.qh.get_pending_commissions(clientkey=self.client)
self.assertEqual(r, [])
def test_010_list_holdings(self):
e0, k0 = ('list_holdings_one', '1')
e1, k1 = ('list_holdings_two', '1')
......@@ -267,14 +274,6 @@ class QHAPITest(QHTestCase):
[(e1, resource, 4, 0, 0, 0)]])
def test_010_pending_commissions(self):
r = self.qh.get_pending_commissions(clientkey=self.client)
self.assertEqual(r, [1])
r = self.qh.resolve_pending_commissions(clientkey=self.client,
max_serial=1, accept_set=[1])
r = self.qh.get_pending_commissions(clientkey=self.client)
self.assertEqual(r, [])
def test_011_release_empty(self):
e, k = self.new_entity()
e0, k0 = self.rand_entity(), Key.random()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment