Mercurial > p > roundup > code
comparison test/rest_common.py @ 5987:ea3485c67f94
Sort accept keys to make p2 and p3 ordering the same
Sort keys of self.__accepted_content_type. Keys returned in different
orders in python2/3. Sorting makes testing easier.
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Tue, 26 Nov 2019 20:47:34 -0500 |
| parents | 8b88fb789208 |
| children | a0ab2c5d1c2a |
comparison
equal
deleted
inserted
replaced
| 5986:8b88fb789208 | 5987:ea3485c67f94 |
|---|---|
| 1586 except ImportError: | 1586 except ImportError: |
| 1587 includexml = '' | 1587 includexml = '' |
| 1588 | 1588 |
| 1589 response="Requested content type 'jon' is not available.\n" \ | 1589 response="Requested content type 'jon' is not available.\n" \ |
| 1590 "Acceptable types: */*, application/json%s\n"%includexml | 1590 "Acceptable types: */*, application/json%s\n"%includexml |
| 1591 self.assertEqual(results, response) | 1591 self.assertEqual(b2s(results), response) |
| 1592 | 1592 |
| 1593 # TEST #9 | 1593 # TEST #9 |
| 1594 # GET: test that version can be set with accept: | 1594 # GET: test that version can be set with accept: |
| 1595 # ... ; version=z | 1595 # ... ; version=z |
| 1596 # or | 1596 # or |
| 1605 headers={"accept": "application/json; notversion=z" } | 1605 headers={"accept": "application/json; notversion=z" } |
| 1606 self.headers=headers | 1606 self.headers=headers |
| 1607 self.server.client.request.headers.get=self.get_header | 1607 self.server.client.request.headers.get=self.get_header |
| 1608 results = self.server.dispatch('GET', | 1608 results = self.server.dispatch('GET', |
| 1609 "/rest/data/issue/1", form) | 1609 "/rest/data/issue/1", form) |
| 1610 print("9a: " + results) | 1610 print("9a: " + b2s(results)) |
| 1611 json_dict = json.loads(b2s(results)) | 1611 json_dict = json.loads(b2s(results)) |
| 1612 self.assertEqual(json_dict['error']['status'], 400) | 1612 self.assertEqual(json_dict['error']['status'], 400) |
| 1613 self.assertEqual(json_dict['error']['msg'], | 1613 self.assertEqual(json_dict['error']['msg'], |
| 1614 "Unrecognized version: L. See /rest without " | 1614 "Unrecognized version: L. See /rest without " |
| 1615 "specifying version for supported versions.") | 1615 "specifying version for supported versions.") |
| 1617 headers={"accept": "application/json; version=z" } | 1617 headers={"accept": "application/json; version=z" } |
| 1618 self.headers=headers | 1618 self.headers=headers |
| 1619 self.server.client.request.headers.get=self.get_header | 1619 self.server.client.request.headers.get=self.get_header |
| 1620 results = self.server.dispatch('GET', | 1620 results = self.server.dispatch('GET', |
| 1621 "/rest/data/issue/1", form) | 1621 "/rest/data/issue/1", form) |
| 1622 print("9b: " + results) | 1622 print("9b: " + b2s(results)) |
| 1623 json_dict = json.loads(b2s(results)) | 1623 json_dict = json.loads(b2s(results)) |
| 1624 self.assertEqual(json_dict['error']['status'], 400) | 1624 self.assertEqual(json_dict['error']['status'], 400) |
| 1625 self.assertEqual(json_dict['error']['msg'], | 1625 self.assertEqual(json_dict['error']['msg'], |
| 1626 "Unrecognized version: z. See /rest without " | 1626 "Unrecognized version: z. See /rest without " |
| 1627 "specifying version for supported versions.") | 1627 "specifying version for supported versions.") |
| 1629 headers={"accept": "application/vnd.roundup.test-vz+json" } | 1629 headers={"accept": "application/vnd.roundup.test-vz+json" } |
| 1630 self.headers=headers | 1630 self.headers=headers |
| 1631 self.server.client.request.headers.get=self.get_header | 1631 self.server.client.request.headers.get=self.get_header |
| 1632 results = self.server.dispatch('GET', | 1632 results = self.server.dispatch('GET', |
| 1633 "/rest/data/issue/1", self.empty_form) | 1633 "/rest/data/issue/1", self.empty_form) |
| 1634 print("9c:" + results) | 1634 print("9c:" + b2s(results)) |
| 1635 self.assertEqual(self.server.client.response_code, 400) | 1635 self.assertEqual(self.server.client.response_code, 400) |
| 1636 json_dict = json.loads(b2s(results)) | 1636 json_dict = json.loads(b2s(results)) |
| 1637 self.assertEqual(json_dict['error']['status'], 400) | 1637 self.assertEqual(json_dict['error']['status'], 400) |
| 1638 self.assertEqual(json_dict['error']['msg'], | 1638 self.assertEqual(json_dict['error']['msg'], |
| 1639 "Unrecognized version: z. See /rest without " | 1639 "Unrecognized version: z. See /rest without " |
| 1644 } | 1644 } |
| 1645 self.headers=headers | 1645 self.headers=headers |
| 1646 self.server.client.request.headers.get=self.get_header | 1646 self.server.client.request.headers.get=self.get_header |
| 1647 results = self.server.dispatch('GET', | 1647 results = self.server.dispatch('GET', |
| 1648 "/rest/data/issue/1", self.empty_form) | 1648 "/rest/data/issue/1", self.empty_form) |
| 1649 print("9d: " + results) | 1649 print("9d: " + b2s(results)) |
| 1650 self.assertEqual(self.server.client.response_code, 400) | 1650 self.assertEqual(self.server.client.response_code, 400) |
| 1651 json_dict = json.loads(b2s(results)) | 1651 json_dict = json.loads(b2s(results)) |
| 1652 self.assertEqual(json_dict['error']['status'], 400) | 1652 self.assertEqual(json_dict['error']['status'], 400) |
| 1653 self.assertEqual(json_dict['error']['msg'], | 1653 self.assertEqual(json_dict['error']['msg'], |
| 1654 "Unrecognized version: a. See /rest without " | 1654 "Unrecognized version: a. See /rest without " |
| 1680 } | 1680 } |
| 1681 | 1681 |
| 1682 self.headers={} | 1682 self.headers={} |
| 1683 results = self.server.dispatch('GET', | 1683 results = self.server.dispatch('GET', |
| 1684 "/rest", self.empty_form) | 1684 "/rest", self.empty_form) |
| 1685 print("10a: " + results) | 1685 print("10a: " + b2s(results)) |
| 1686 self.assertEqual(self.server.client.response_code, 200) | 1686 self.assertEqual(self.server.client.response_code, 200) |
| 1687 results_dict = json.loads(b2s(results)) | 1687 results_dict = json.loads(b2s(results)) |
| 1688 self.assertEqual(results_dict, expected_rest) | 1688 self.assertEqual(results_dict, expected_rest) |
| 1689 | 1689 |
| 1690 | 1690 |
| 1691 results = self.server.dispatch('GET', | 1691 results = self.server.dispatch('GET', |
| 1692 "/rest/", self.empty_form) | 1692 "/rest/", self.empty_form) |
| 1693 print("10b: " + results) | 1693 print("10b: " + b2s(results)) |
| 1694 self.assertEqual(self.server.client.response_code, 200) | 1694 self.assertEqual(self.server.client.response_code, 200) |
| 1695 results_dict = json.loads(b2s(results)) | 1695 results_dict = json.loads(b2s(results)) |
| 1696 self.assertEqual(results_dict, expected_rest) | 1696 self.assertEqual(results_dict, expected_rest) |
| 1697 | 1697 |
| 1698 results = self.server.dispatch('GET', | 1698 results = self.server.dispatch('GET', |
| 1699 "/rest/summary", self.empty_form) | 1699 "/rest/summary", self.empty_form) |
| 1700 print("10c: " + results) | 1700 print("10c: " + b2s(results)) |
| 1701 self.assertEqual(self.server.client.response_code, 200) | 1701 self.assertEqual(self.server.client.response_code, 200) |
| 1702 | 1702 |
| 1703 results = self.server.dispatch('GET', | 1703 results = self.server.dispatch('GET', |
| 1704 "/rest/summary/", self.empty_form) | 1704 "/rest/summary/", self.empty_form) |
| 1705 print("10d: " + results) | 1705 print("10d: " + b2s(results)) |
| 1706 self.assertEqual(self.server.client.response_code, 200) | 1706 self.assertEqual(self.server.client.response_code, 200) |
| 1707 | 1707 |
| 1708 expected_data = { | 1708 expected_data = { |
| 1709 "data": { | 1709 "data": { |
| 1710 "issue": { | 1710 "issue": { |
| 1734 } | 1734 } |
| 1735 } | 1735 } |
| 1736 | 1736 |
| 1737 results = self.server.dispatch('GET', | 1737 results = self.server.dispatch('GET', |
| 1738 "/rest/data", self.empty_form) | 1738 "/rest/data", self.empty_form) |
| 1739 print("10e: " + results) | 1739 print("10e: " + b2s(results)) |
| 1740 self.assertEqual(self.server.client.response_code, 200) | 1740 self.assertEqual(self.server.client.response_code, 200) |
| 1741 results_dict = json.loads(b2s(results)) | 1741 results_dict = json.loads(b2s(results)) |
| 1742 self.assertEqual(results_dict, expected_data) | 1742 self.assertEqual(results_dict, expected_data) |
| 1743 | 1743 |
| 1744 results = self.server.dispatch('GET', | 1744 results = self.server.dispatch('GET', |
| 1745 "/rest/data/", self.empty_form) | 1745 "/rest/data/", self.empty_form) |
| 1746 print("10f: " + results) | 1746 print("10f: " + b2s(results)) |
| 1747 self.assertEqual(self.server.client.response_code, 200) | 1747 self.assertEqual(self.server.client.response_code, 200) |
| 1748 results_dict = json.loads(b2s(results)) | 1748 results_dict = json.loads(b2s(results)) |
| 1749 self.assertEqual(results_dict, expected_data) | 1749 self.assertEqual(results_dict, expected_data) |
| 1750 | 1750 |
| 1751 results = self.server.dispatch('GET', | 1751 results = self.server.dispatch('GET', |
