Merge pull request #75 from opendata-swiss/tests/add-github-workflow-…

…action-for-tests

Tests/add GitHub workflow action for tests

.github/workflows/test.yml

@@ -0,0 +1,68 @@
+name: Tests
+on: [push, pull_request]
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    container:
+      image: python:2.7.18-buster
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install requirements
+        run: pip install flake8 pycodestyle
+      - name: Check syntax
+        run: flake8 --statistics --show-source --exclude ckanext/dcatapchharvest/tests,setup.py ckanext
+
+  test:
+    needs: lint
+    strategy:
+      matrix:
+        ckan-version: [2.8]
+      fail-fast: false
+
+    name: CKAN ${{ matrix.ckan-version }}
+    runs-on: ubuntu-latest
+    container:
+      image: openknowledge/ckan-dev:${{ matrix.ckan-version }}
+    services:
+      solr:
+        image: ckan/ckan-solr:${{ matrix.ckan-version }}
+      postgres:
+        image: ckan/ckan-postgres-dev:${{ matrix.ckan-version }}
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: postgres
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+      redis:
+          image: redis:3
+    env:
+      CKAN_SQLALCHEMY_URL: postgresql://ckan_default:pass@postgres/ckan_test
+      CKAN_DATASTORE_WRITE_URL: postgresql://datastore_write:pass@postgres/datastore_test
+      CKAN_DATASTORE_READ_URL: postgresql://datastore_read:pass@postgres/datastore_test
+      CKAN_SOLR_URL: http://solr:8983/solr/ckan
+      CKAN_REDIS_URL: redis://redis:6379/1
+      CKAN_SITE_URL: http://test.ckan.net
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Install requirements
+      run: |
+        # Replace default path to CKAN core config file with the one on the container
+        sed -i -e 's/use = config:.*/use = config:\/srv\/app\/src\/ckan\/test-core.ini/' test.ini
+        pip install -r requirements.txt
+        pip install -r dev-requirements.txt
+        pip install -e .
+        # Last commit before support for Python 2 was dropped
+        pip install -e git+https://github.com/ckan/[email protected]#egg=ckanext-harvest
+        pip install -r https://raw.githubusercontent.com/ckan/ckanext-harvest/v1.4.2/requirements.txt
+        # Last commit before support for Python 2 was dropped
+        pip install -e git+https://github.com/ckan/ckanext-dcat.git@0c26bed5b7a3a7fca8e7b78e338aace096e0ebf6#egg=ckanext-dcat
+        pip install -r https://raw.githubusercontent.com/ckan/ckanext-dcat/0c26bed5b7a3a7fca8e7b78e338aace096e0ebf6/requirements-py2.txt
+        pip install -r https://raw.githubusercontent.com/ckan/ckanext-dcat/0c26bed5b7a3a7fca8e7b78e338aace096e0ebf6/dev-requirements-py2.txt
+
+    - name: Setup extension
+      run: |
+        paster --plugin=ckan db init -c test.ini
+        paster --plugin=ckanext-harvest harvester initdb -c test.ini
+    - name: Run tests
+      run: nosetests --ckan --nocapture --nologcapture --with-pylons=test.ini --with-coverage --cover-package=ckanext.dcatapchharvest --cover-inclusive --cover-erase --cover-tests ckanext/dcatapchharvest

ckanext/dcatapchharvest/dcat_helpers.py

@@ -45,8 +45,8 @@ def uri_to_iri(uri):
     try:
         iri = iribaker.to_iri(uri)
         return iri
-    except:
-        raise ValueError("Provided URI can't be converted to IRI")
+    except Exception as e:
+        raise ValueError("Provided URI can't be converted to IRI: %s" % e)
 
 
 def get_langs():

ckanext/dcatapchharvest/harvesters.py

@@ -107,8 +107,8 @@ def _get_guid(self, dataset_dict, source_url=None):  # noqa
                         log.error(error_msg)
                         self._save_gather_error(error_msg, self.harvest_job)
                         return None
-            except:
-                log.exception("An error occured")
+            except Exception as e:
+                log.exception("Error when getting identifier: %s" % e)
                 return None
             return dataset_dict['identifier']