Revision 93a77d30

b/snf-astakos-app/astakos/im/tests.py
1432 1432
                          [resource11, resource12, resource21]]
1433 1433

  
1434 1434
        # get resources
1435
        r = client.get(u('resources'), follow=True)
1435
        r = client.get(u('resources'))
1436 1436
        self.assertEqual(r.status_code, 200)
1437 1437
        body = json.loads(r.content)
1438 1438
        for name in resource_names:
1439 1439
            assertIn(name, body)
1440 1440

  
1441 1441
        # get quota
1442
        r = client.get(u('quotas'), follow=True)
1442
        r = client.get(u('quotas'))
1443 1443
        self.assertEqual(r.status_code, 401)
1444 1444

  
1445 1445
        headers = {'HTTP_X_AUTH_TOKEN': user.auth_token}
1446
        r = client.get(u('quotas'), follow=True, **headers)
1446
        r = client.get(u('quotas/'), **headers)
1447 1447
        self.assertEqual(r.status_code, 200)
1448 1448
        body = json.loads(r.content)
1449 1449
        system_quota = body['system']
......
1451 1451
        for name in resource_names:
1452 1452
            assertIn(name, system_quota)
1453 1453

  
1454
        r = client.get(u('service_quotas'), follow=True)
1454
        r = client.get(u('service_quotas'))
1455 1455
        self.assertEqual(r.status_code, 401)
1456 1456

  
1457 1457
        s1_headers = {'HTTP_X_AUTH_TOKEN': service1.auth_token}
1458
        r = client.get(u('service_quotas'), follow=True, **s1_headers)
1458
        r = client.get(u('service_quotas'), **s1_headers)
1459 1459
        self.assertEqual(r.status_code, 200)
1460 1460
        body = json.loads(r.content)
1461 1461
        assertIn(user.uuid, body)
1462 1462

  
1463
        r = client.get(u('commissions'), follow=True, **s1_headers)
1463
        r = client.get(u('commissions'), **s1_headers)
1464 1464
        self.assertEqual(r.status_code, 200)
1465 1465
        body = json.loads(r.content)
1466 1466
        self.assertEqual(body, [])
......
1529 1529
        body = json.loads(r.content)
1530 1530
        self.assertEqual(body['serial'], 3)
1531 1531

  
1532
        r = client.get(u('commissions'), follow=True, **s1_headers)
1532
        r = client.get(u('commissions'), **s1_headers)
1533 1533
        self.assertEqual(r.status_code, 200)
1534 1534
        body = json.loads(r.content)
1535 1535
        self.assertEqual(body, [1, 2, 3])
1536 1536

  
1537
        r = client.get(u('commissions/' + str(serial)), follow=True,
1538
                       **s1_headers)
1537
        r = client.get(u('commissions/' + str(serial)), **s1_headers)
1539 1538
        self.assertEqual(r.status_code, 200)
1540 1539
        body = json.loads(r.content)
1541 1540
        self.assertEqual(body['serial'], serial)
......
1543 1542
        self.assertEqual(body['provisions'], commission_request['provisions'])
1544 1543
        self.assertEqual(body['name'], commission_request['name'])
1545 1544

  
1546
        r = client.get(u('service_quotas?user=' + user.uuid),
1547
                       follow=True, **s1_headers)
1545
        r = client.get(u('service_quotas?user=' + user.uuid), **s1_headers)
1548 1546
        self.assertEqual(r.status_code, 200)
1549 1547
        body = json.loads(r.content)
1550 1548
        user_quota = body[user.uuid]
......
1569 1567
        failed = body['failed']
1570 1568
        self.assertEqual(len(failed), 2)
1571 1569

  
1572
        r = client.get(u('commissions/' + str(serial)), follow=True,
1573
                       **s1_headers)
1570
        r = client.get(u('commissions/' + str(serial)), **s1_headers)
1574 1571
        self.assertEqual(r.status_code, 404)
1575 1572

  
1576 1573
        # auto accept
......
1599 1596
        serial = body['serial']
1600 1597
        self.assertEqual(serial, 4)
1601 1598

  
1602
        r = client.get(u('commissions/' + str(serial)), follow=True,
1603
                       **s1_headers)
1599
        r = client.get(u('commissions/' + str(serial)), **s1_headers)
1604 1600
        self.assertEqual(r.status_code, 404)
1605 1601

  
1606 1602
        # malformed
b/snf-common/synnefo/settings/test.py
19 19
SOUTH_TESTS_MIGRATE = bool(int(os.environ.get('SOUTH_TESTS_MIGRATE', True)))
20 20

  
21 21
ASTAKOS_IM_MODULES = ['local', 'shibboleth']
22

  
23
CYCLADES_PROXY_USER_SERVICES = False
24
PITHOS_PROXY_USER_SERVICES = False

Also available in: Unified diff