From 5369644cc2719e1bceae356f9427d2aac0a6b03c Mon Sep 17 00:00:00 2001 From: Dominik Moritz Date: Sun, 11 Nov 2012 23:00:53 +0100 Subject: [PATCH] start resource proxy test for status code 200 --- ckan/lib/helpers.py | 1 + ckanext/resourceproxy/tests/test_proxy.py | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py index cee651a691c..62b343edab0 100644 --- a/ckan/lib/helpers.py +++ b/ckan/lib/helpers.py @@ -1326,6 +1326,7 @@ def resource_preview(resource, pkg_id): directly = False url = '' + # todo: add package data_dict = {'resource': resource, 'package': None} if not resource['url']: diff --git a/ckanext/resourceproxy/tests/test_proxy.py b/ckanext/resourceproxy/tests/test_proxy.py index f20d01bbf79..14c63bb76eb 100644 --- a/ckanext/resourceproxy/tests/test_proxy.py +++ b/ckanext/resourceproxy/tests/test_proxy.py @@ -72,11 +72,11 @@ def teardown_class(cls): def test_resource_proxy(self): url = self.data_dict['resource']['url'] - result = self.app.get(url, status=200) - assert result.status == 200, result.status - assert "yes, I'm proxied" in result.body, result.body + result = requests.get(url) + assert result.status_code == 200, result.status_code + assert "yes, I'm proxied" in result.content, result.content proxied_url = proxy.get_proxified_resource_url(self.data_dict) - result = self.app.get(proxied_url).follow() - assert result.status == 200, result.status - assert "yes, I'm proxied" in result.body, result.body + result = requests.get(proxied_url) + assert result.status_code == 200, result.status_code + assert "yes, I'm proxied" in result.content, result.content