Revision d2b32360 snf-quotaholder-app/quotaholder_django/test/simpletests.py

b/snf-quotaholder-app/quotaholder_django/test/simpletests.py
230 230
        resource1 = self.rand_resource()
231 231

  
232 232
        r = self.qh.set_quota(
233
            set_quota=[(e0, resource0, k0) + (5, 5, 5, 5) + (0,),
233
            set_quota=[(e0, resource0, k0) + (5, None, 5, 6) + (0,),
234 234
                       (e1, resource0, k1) + (5, 5, 5, 5) + (0,)])
235 235
        self.assertEqual(r, [])
236 236

  
237 237
        r = self.qh.add_quota(clientkey=self.client,
238 238
                              serial=1,
239
                              add_quota=[(e0, resource0, k0, 0, (-2), None, 0),
239
                              sub_quota=[(e0, resource0, k0, 0, None, 1, 1)],
240
                              add_quota=[(e0, resource0, k0, 0, 3, None, 0),
241
                                         # new holding
240 242
                                         (e0, resource1, k0, 0, None, 5, 5)])
241 243
        self.assertEqual(r, [])
242 244

  
243 245
        r = self.qh.get_quota(get_quota=[(e0, resource0, k0),
244 246
                                         (e0, resource1, k0)])
245
        self.assertEqual(r, [(e0, resource0, 5, 5 - 2, None, 5)
247
        self.assertEqual(r, [(e0, resource0, 5, 3, None, 5)
246 248
                             + DEFAULT_HOLDING + (0,),
247 249
                             (e0, resource1, 0, None, 5, 5)
248 250
                             + DEFAULT_HOLDING + (0,)])
......
250 252
        # repeated serial
251 253
        r = self.qh.add_quota(clientkey=self.client,
252 254
                              serial=1,
253
                              add_quota=[(e0, resource0, k0, 0, 2, None, 0),
254
                                         (e0, resource1, k0, 0, None, (-5), 0)])
255
        self.assertEqual(r, [(e0, resource0), (e0, resource1)])
255
                              sub_quota=[(e0, resource1, k0, 0, None, (-5), 0)],
256
                              add_quota=[(e0, resource0, k0, 0, 2, None, 0)])
257
        self.assertEqual(r, [(e0, resource1), (e0, resource0)])
256 258

  
257 259
        r = self.qh.query_serials(clientkey=self.client, serials=[1, 2])
258 260
        self.assertEqual(r, [1])

Also available in: Unified diff