diff --git a/swh/web/tests/api/test_apidoc.py b/swh/web/tests/api/test_apidoc.py --- a/swh/web/tests/api/test_apidoc.py +++ b/swh/web/tests/api/test_apidoc.py @@ -83,7 +83,7 @@ rv = self.client.get('/api/1/some/doc/route/') # then - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertTemplateUsed('api/apidoc.html') def test_apidoc_route_fn(self): @@ -92,7 +92,7 @@ rv = self.client.get('/api/1/some/1/1/') # then - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) @staticmethod @api_route(r'/some/full/(?P[0-9]+)/(?P[0-9]+)/', @@ -109,7 +109,7 @@ rv = self.client.get('/api/1/some/complete/doc/route/') # then - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertTemplateUsed('api/apidoc.html') def test_apidoc_full_stack_fn(self): @@ -117,7 +117,7 @@ rv = self.client.get('/api/1/some/full/1/1/') # then - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) def test_api_doc_parse_httpdomain(self): doc_data = { diff --git a/swh/web/tests/api/test_apiresponse.py b/swh/web/tests/api/test_apiresponse.py --- a/swh/web/tests/api/test_apiresponse.py +++ b/swh/web/tests/api/test_apiresponse.py @@ -131,7 +131,7 @@ # then mock_filter.assert_called_with(request, data) self.assertEqual(rv.data, expected_data) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) if mime_type == 'text/html': self.assertEqual(rv.template_name, 'api/apidoc.html') diff --git a/swh/web/tests/api/views/test_content.py b/swh/web/tests/api/views/test_content.py --- a/swh/web/tests/api/views/test_content.py +++ b/swh/web/tests/api/views/test_content.py @@ -28,7 +28,7 @@ url_args={'q': 'sha1_git:%s' % content['sha1_git']}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') content_url = reverse('api-1-content', url_args={'q': 'sha1:%s' % content['sha1']}) @@ -43,7 +43,7 @@ url_args={'q': 'sha1:%s' % unknown_content_['sha1']}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 404) + self.assertEqual(rv.status_code, 404, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'exception': 'NotFoundExc', @@ -60,7 +60,7 @@ url_args={'q': 'sha1_git:%s' % content['sha1_git']}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') content_url = reverse('api-1-content', url_args={'q': 'sha1:%s' % content['sha1']}) @@ -75,7 +75,7 @@ url_args={'q': 'sha1:%s' % unknown_content_['sha1']}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 404) + self.assertEqual(rv.status_code, 404, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'exception': 'NotFoundExc', @@ -101,7 +101,7 @@ query_params={'per_page': 100}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') for entry in rv.data: content_sha1 = entry['sha1'] @@ -135,7 +135,7 @@ url = reverse('api-1-content-symbol', url_args={'q': 'bar'}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 404) + self.assertEqual(rv.status_code, 404, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'exception': 'NotFoundExc', @@ -153,7 +153,7 @@ url_args={'q': 'sha1_git:%s' % content['sha1_git']}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') content_url = reverse('api-1-content', url_args={'q': 'sha1:%s' % content['sha1']}) @@ -172,7 +172,7 @@ url_args={'q': 'sha1_git:%s' % content['sha1_git']}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') content_url = reverse('api-1-content', url_args={'q': 'sha1:%s' % content['sha1']}) @@ -187,7 +187,7 @@ url_args={'q': 'sha1:%s' % unknown_content_['sha1']}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 404) + self.assertEqual(rv.status_code, 404, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'exception': 'NotFoundExc', @@ -201,7 +201,7 @@ url = reverse('api-1-content', {'q': 'sha1:%s' % content['sha1']}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') expected_data = self.content_get_metadata(content['sha1']) for key, view_name in (('data_url', 'api-1-content-raw'), @@ -219,7 +219,7 @@ url = reverse('api-1-content', url_args={'q': 'sha1:%s' % unknown_content_['sha1']}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 404) + self.assertEqual(rv.status_code, 404, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'exception': 'NotFoundExc', @@ -234,7 +234,7 @@ url_args={'q': 'sha256:%s' % unknown_content_['sha256']}) rv = self.client.get(url, HTTP_ACCEPT='application/yaml') - self.assertEqual(rv.status_code, 404) + self.assertEqual(rv.status_code, 404, rv.data) self.assertTrue('application/yaml' in rv['Content-Type']) self.assertEqual(rv.data, { @@ -250,7 +250,7 @@ url_args={'q': 'sha1:%s' % unknown_content_['sha1']}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 404) + self.assertEqual(rv.status_code, 404, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'exception': 'NotFoundExc', @@ -301,7 +301,7 @@ url_args={'q': content['sha1']}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { @@ -321,7 +321,7 @@ url_args={'q': content['sha1']}) rv = self.client.get(url, HTTP_ACCEPT='application/yaml') - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/yaml') self.assertEqual(rv.data, { @@ -346,7 +346,7 @@ HTTP_ACCEPT='application/yaml' ) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertTrue('application/yaml' in rv['Content-Type']) self.assertEqual(rv.data, { 'search_res': [ @@ -365,7 +365,7 @@ url_args={'q': unknown_content_['sha1']}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'search_res': [ diff --git a/swh/web/tests/api/views/test_directory.py b/swh/web/tests/api/views/test_directory.py --- a/swh/web/tests/api/views/test_directory.py +++ b/swh/web/tests/api/views/test_directory.py @@ -22,7 +22,7 @@ url = reverse('api-1-directory', url_args={'sha1_git': directory}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') expected_data = list(map(self._enrich_dir_data, @@ -37,7 +37,7 @@ url_args={'sha1_git': unknown_directory_}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 404) + self.assertEqual(rv.status_code, 404, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'exception': 'NotFoundExc', @@ -55,7 +55,7 @@ 'path': path['name']}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, self._enrich_dir_data(path)) @@ -68,7 +68,7 @@ 'path': path}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 404) + self.assertEqual(rv.status_code, 404, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'exception': 'NotFoundExc', diff --git a/swh/web/tests/api/views/test_identifiers.py b/swh/web/tests/api/views/test_identifiers.py --- a/swh/web/tests/api/views/test_identifiers.py +++ b/swh/web/tests/api/views/test_identifiers.py @@ -58,7 +58,7 @@ 'scheme_version': 1 } - self.assertEqual(resp.status_code, 200) + self.assertEqual(resp.status_code, 200, resp.data) self.assertEqual(resp.data, expected_result) def test_swh_id_resolve_invalid(self): @@ -68,7 +68,7 @@ resp = self.client.get(url) - self.assertEqual(resp.status_code, 400) + self.assertEqual(resp.status_code, 400, resp.data) @given(unknown_content(), unknown_directory(), unknown_release(), unknown_revision(), unknown_snapshot()) @@ -88,4 +88,4 @@ resp = self.client.get(url) - self.assertEqual(resp.status_code, 404) + self.assertEqual(resp.status_code, 404, resp.data) diff --git a/swh/web/tests/api/views/test_origin.py b/swh/web/tests/api/views/test_origin.py --- a/swh/web/tests/api/views/test_origin.py +++ b/swh/web/tests/api/views/test_origin.py @@ -33,7 +33,7 @@ url = reverse('api-1-origin-visits', url_args={'origin_id': 2}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 400) + self.assertEqual(rv.status_code, 400, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'exception': 'ValueError', @@ -50,7 +50,7 @@ url = reverse('api-1-origin-visits', url_args={'origin_id': 2}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 503) + self.assertEqual(rv.status_code, 503, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'exception': 'StorageDBError', @@ -68,7 +68,7 @@ url = reverse('api-1-origin-visits', url_args={'origin_id': 2}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 503) + self.assertEqual(rv.status_code, 503, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'exception': 'StorageAPIError', @@ -100,7 +100,7 @@ rv = self.client.get(url) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') for expected_visit in expected_visits: @@ -132,7 +132,7 @@ 'visit_id': visit_id}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') expected_visit = self.origin_visit_get_by(origin_id, visit_id) @@ -161,7 +161,7 @@ rv = self.client.get(url) - self.assertEqual(rv.status_code, 404) + self.assertEqual(rv.status_code, 404, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'exception': 'NotFoundExc', @@ -183,7 +183,7 @@ expected_origin['origin_visits_url'] = origin_visits_url - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, expected_origin) @@ -202,7 +202,7 @@ expected_origin['origin_visits_url'] = origin_visits_url - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, expected_origin) @@ -214,7 +214,7 @@ 'origin_url': new_origin['url']}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 404) + self.assertEqual(rv.status_code, 404, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'exception': 'NotFoundExc', @@ -386,7 +386,7 @@ rv = self.client.get(url) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) start = origin_from_idx end = origin_from_idx + origin_count diff --git a/swh/web/tests/api/views/test_person.py b/swh/web/tests/api/views/test_person.py --- a/swh/web/tests/api/views/test_person.py +++ b/swh/web/tests/api/views/test_person.py @@ -24,7 +24,7 @@ expected_person = self.person_get(person) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, expected_person) @@ -35,7 +35,7 @@ rv = self.client.get(url) - self.assertEqual(rv.status_code, 404) + self.assertEqual(rv.status_code, 404, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'exception': 'NotFoundExc', diff --git a/swh/web/tests/api/views/test_release.py b/swh/web/tests/api/views/test_release.py --- a/swh/web/tests/api/views/test_release.py +++ b/swh/web/tests/api/views/test_release.py @@ -35,7 +35,7 @@ expected_release['author_url'] = author_url expected_release['target_url'] = target_url - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, expected_release) @@ -93,7 +93,7 @@ expected_release['author_url'] = author_url expected_release['target_url'] = target_url - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, expected_release) @@ -104,7 +104,7 @@ rv = self.client.get(url) - self.assertEqual(rv.status_code, 404) + self.assertEqual(rv.status_code, 404, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'exception': 'NotFoundExc', diff --git a/swh/web/tests/api/views/test_revision.py b/swh/web/tests/api/views/test_revision.py --- a/swh/web/tests/api/views/test_revision.py +++ b/swh/web/tests/api/views/test_revision.py @@ -33,7 +33,7 @@ self._enrich_revision(expected_revision) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, expected_revision) @@ -44,7 +44,7 @@ url_args={'sha1_git': unknown_revision_}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 404) + self.assertEqual(rv.status_code, 404, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'exception': 'NotFoundExc', @@ -77,7 +77,7 @@ rv = self.client.get(url) - self.assertEqual(rv.status_code, 404) + self.assertEqual(rv.status_code, 404, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'exception': 'NotFoundExc', @@ -91,7 +91,7 @@ url_args={'sha1_git': unknown_revision_}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 404) + self.assertEqual(rv.status_code, 404, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'exception': 'NotFoundExc', @@ -105,7 +105,7 @@ url_args={'origin_id': unknown_origin_id_}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 404) + self.assertEqual(rv.status_code, 404, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'exception': 'NotFoundExc', @@ -125,7 +125,7 @@ self._enrich_revision(expected_revision) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, expected_revision) @@ -149,7 +149,7 @@ self._enrich_revision(expected_revision) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, expected_revision) @@ -176,7 +176,7 @@ self._enrich_revision(expected_revision) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, expected_revision) @@ -207,7 +207,7 @@ self._enrich_revision(expected_revision) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, expected_revision) @@ -218,7 +218,7 @@ url_args={'origin_id': unknown_origin_id_}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 404) + self.assertEqual(rv.status_code, 404, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'exception': 'NotFoundExc', @@ -274,7 +274,7 @@ 'type': 'dir' } - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, expected_result) @@ -293,7 +293,7 @@ has_next = len(expected_log) > per_page - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, expected_log[:-1] if has_next else expected_log) @@ -314,7 +314,7 @@ rv = self.client.get(url) - self.assertEqual(rv.status_code, 404) + self.assertEqual(rv.status_code, 404, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'exception': 'NotFoundExc', @@ -344,7 +344,7 @@ expected_log.insert(0, prev_revision) expected_log = list(map(self._enrich_revision, expected_log)) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, expected_log) @@ -368,7 +368,7 @@ has_next = len(expected_log) > per_page - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, expected_log[:-1] if has_next else expected_log) @@ -393,7 +393,7 @@ rv = self.client.get(url) - self.assertEqual(rv.status_code, 404) + self.assertEqual(rv.status_code, 404, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertFalse(rv.has_header('Link')) self.assertEqual( @@ -410,7 +410,7 @@ # then rv = self.client.get('/api/1/revision/999/directory/some/path/to/dir/') - self.assertEqual(rv.status_code, 404) + self.assertEqual(rv.status_code, 404, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'exception': 'NotFoundExc', @@ -454,7 +454,7 @@ # then rv = self.client.get('/api/1/revision/999/directory/some/path/') - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, stub_dir) @@ -483,7 +483,7 @@ url = '/api/1/revision/666/directory/some/other/path/' rv = self.client.get(url) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, stub_content) diff --git a/swh/web/tests/api/views/test_snapshot.py b/swh/web/tests/api/views/test_snapshot.py --- a/swh/web/tests/api/views/test_snapshot.py +++ b/swh/web/tests/api/views/test_snapshot.py @@ -26,7 +26,7 @@ url_args={'snapshot_id': snapshot}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') expected_data = self.snapshot_get(snapshot) expected_data = self._enrich_snapshot(expected_data) @@ -56,7 +56,7 @@ query_params={'branches_from': branches_from, 'branches_count': branches_count}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') expected_data = self.snapshot_get_branches(snapshot, branches_from, branches_count) @@ -87,7 +87,7 @@ url_args={'snapshot_id': snapshot}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, whole_snapshot) @@ -114,7 +114,7 @@ snapshot, target_types=target_type) expected_data = self._enrich_snapshot(expected_data) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, expected_data) @@ -124,12 +124,12 @@ url = reverse('api-1-snapshot', url_args={'snapshot_id': '63ce369'}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 400) + self.assertEqual(rv.status_code, 400, rv.data) url = reverse('api-1-snapshot', url_args={'snapshot_id': unknown_snapshot_}) rv = self.client.get(url) - self.assertEqual(rv.status_code, 404) + self.assertEqual(rv.status_code, 404, rv.data) def _enrich_snapshot(self, snapshot): def _get_branch_url(target_type, target): diff --git a/swh/web/tests/api/views/test_stat.py b/swh/web/tests/api/views/test_stat.py --- a/swh/web/tests/api/views/test_stat.py +++ b/swh/web/tests/api/views/test_stat.py @@ -22,7 +22,7 @@ url = reverse('api-1-stat-counters') rv = self.client.get(url) - self.assertEqual(rv.status_code, 400) + self.assertEqual(rv.status_code, 400, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'exception': 'ValueError', @@ -37,7 +37,7 @@ url = reverse('api-1-stat-counters') rv = self.client.get(url) - self.assertEqual(rv.status_code, 503) + self.assertEqual(rv.status_code, 503, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'exception': 'StorageDBError', @@ -55,7 +55,7 @@ url = reverse('api-1-stat-counters') rv = self.client.get(url) - self.assertEqual(rv.status_code, 503) + self.assertEqual(rv.status_code, 503, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, { 'exception': 'StorageAPIError', @@ -70,6 +70,6 @@ rv = self.client.get(url) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, self.storage.stat_counters()) diff --git a/swh/web/tests/api/views/test_vault.py b/swh/web/tests/api/views/test_vault.py --- a/swh/web/tests/api/views/test_vault.py +++ b/swh/web/tests/api/views/test_vault.py @@ -39,7 +39,7 @@ url += '{}/'.format(obj_type_format) rv = self.client.post(url, {'email': 'test@test.mail'}) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, stub_cook) @@ -78,7 +78,7 @@ url += '{}/'.format(obj_type_format) rv = self.client.post(url, {'email': 'test@test.mail'}) - self.assertEqual(rv.status_code, 200) + self.assertEqual(rv.status_code, 200, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data, stub_cook) @@ -106,7 +106,7 @@ url += '{}/'.format(obj_type_format) rv = self.client.post(url) - self.assertEqual(rv.status_code, 404) + self.assertEqual(rv.status_code, 404, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data['exception'], 'NotFoundExc') @@ -115,7 +115,7 @@ rv = self.client.get(url + 'raw/') - self.assertEqual(rv.status_code, 404) + self.assertEqual(rv.status_code, 404, rv.data) self.assertEqual(rv['Content-Type'], 'application/json') self.assertEqual(rv.data['exception'], 'NotFoundExc') mock_service.vault_fetch.assert_called_with(