Merge pull request #204 from ckan/github-176-download-proxy

Document the ckan.download_proxy setting, #176

README.rst

@@ -191,6 +191,10 @@ Configuration:
 
 See the extension's `config_declaration.yaml <ckanext/xloader/config_declaration.yaml>`_ file.
 
+This plugin also supports the `ckan.download_proxy` setting, to use a proxy server when downloading files.
+This setting is shared with other plugins that download resource files, such as ckanext-archiver. Eg:
+
+    ckan.download_proxy = http://my-proxy:1234/
 
 ------------------------
 Developer installation

ckanext/xloader/tests/test_loader.py

@@ -622,39 +622,39 @@ def test_german(self, Session):
 
     def test_with_blanks(self, Session):
         csv_filepath = get_sample_filepath("sample_with_blanks.csv")
-        resource_id = "test1"
-        factories.Resource(id=resource_id)
+        resource = factories.Resource()
+        resource_id = resource['id']
         loader.load_csv(
             csv_filepath,
             resource_id=resource_id,
             mimetype="text/csv",
             logger=logger,
         )
-        assert len(self._get_records(Session, "test1")) == 3
+        assert len(self._get_records(Session, resource_id)) == 3
 
     def test_with_mixed_quotes(self, Session):
         csv_filepath = get_sample_filepath("sample_with_mixed_quotes.csv")
-        resource_id = "test1"
-        factories.Resource(id=resource_id)
+        resource = factories.Resource()
+        resource_id = resource['id']
         loader.load_csv(
             csv_filepath,
             resource_id=resource_id,
             mimetype="text/csv",
             logger=logger,
         )
-        assert len(self._get_records(Session, "test1")) == 2
+        assert len(self._get_records(Session, resource_id)) == 2
 
     def test_with_mixed_types(self, Session):
         csv_filepath = get_sample_filepath("mixed_numeric_string_sample.csv")
-        resource_id = "test1"
-        factories.Resource(id=resource_id)
+        resource = factories.Resource()
+        resource_id = resource['id']
         loader.load_csv(
             csv_filepath,
             resource_id=resource_id,
             mimetype="text/csv",
             logger=logger,
         )
-        assert len(self._get_records(Session, "test1")) == 2
+        assert len(self._get_records(Session, resource_id)) == 2
 
     def test_reload(self, Session):
         csv_filepath = get_sample_filepath("simple.csv")
@@ -1182,12 +1182,12 @@ def test_no_entries(self):
 
     def test_with_mixed_quotes(self, Session):
         csv_filepath = get_sample_filepath("sample_with_mixed_quotes.csv")
-        resource_id = "test1"
-        factories.Resource(id=resource_id)
+        resource = factories.Resource()
+        resource_id = resource['id']
         loader.load_table(
             csv_filepath,
             resource_id=resource_id,
             mimetype="text/csv",
             logger=logger,
         )
-        assert len(self._get_records(Session, "test1")) == 2
+        assert len(self._get_records(Session, resource_id)) == 2