Tidy stuff up a little bit. Add coverage to tests

palewire · Nov 19, 2022 · e8626b2 · e8626b2
1 parent 8f57121
commit e8626b2
Show file tree

Hide file tree

Showing 7 changed files with 161 additions and 48 deletions.
diff --git a/.github/workflows/archive-bundle.yml b/.github/workflows/archive-bundle.yml
diff --git a/.github/workflows/continuous-deployment.yml b/.github/workflows/continuous-deployment.yml
@@ -18,9 +18,22 @@ jobs:
         name: Checkout
         uses: actions/checkout@v3
 
-      - id: install
-        name: Install
-        uses: ./.github/actions/install
+      - id: setup-python
+        name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
+          cache: 'pipenv'
+
+      - id: install-pipenv
+        name: Install pipenv
+        run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python
+        shell: bash
+
+      - id: install-python-dependencies
+        name: Install Python dependencies
+        run: pipenv install --dev --python=`which python`
+        shell: bash
 
       - id: lint
         name: Lint
@@ -34,9 +47,22 @@ jobs:
         name: Checkout
         uses: actions/checkout@v3
 
-      - id: install
-        name: Install Python and dependencies
-        uses: ./.github/actions/install
+      - id: setup-python
+        name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
+          cache: 'pipenv'
+
+      - id: install-pipenv
+        name: Install pipenv
+        run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python
+        shell: bash
+
+      - id: install-python-dependencies
+        name: Install Python dependencies
+        run: pipenv install --dev --python=`which python`
+        shell: bash
 
       - id: cache-playwright
         name: Cache Playwright
@@ -54,7 +80,10 @@ jobs:
 
       - id: test
         name: Run tests
-        run: pipenv run xvfb-run pytest tests
+        run: pipenv run xvfb-run pytest tests -sv --cov
+        shell: bash
+        env:
+            IA_COLLECTION: ${{ secrets.IA_COLLECTION }}
 
   static-type-check:
     name: Static type check
@@ -64,9 +93,22 @@ jobs:
         name: Checkout
         uses: actions/checkout@v3
 
-      - id: install
-        name: Install
-        uses: ./.github/actions/install
+      - id: setup-python
+        name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
+          cache: 'pipenv'
+
+      - id: install-pipenv
+        name: Install pipenv
+        run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python
+        shell: bash
+
+      - id: install-python-dependencies
+        name: Install Python dependencies
+        run: pipenv install --dev --python=`which python`
+        shell: bash
 
       - id: mypy
         name: mypy

diff --git a/.github/workflows/site.yml b/.github/workflows/site.yml
@@ -18,9 +18,22 @@ jobs:
         name: Checkout
         uses: actions/checkout@v3
 
-      - id: install
-        name: Install
-        uses: ./.github/actions/install
+      - id: setup-python
+        name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
+          cache: 'pipenv'
+
+      - id: install-pipenv
+        name: Install pipenv
+        run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python
+        shell: bash
+
+      - id: install-python-dependencies
+        name: Install Python dependencies
+        run: pipenv install --dev --python=`which python`
+        shell: bash
 
       - id: make
         name: Make

diff --git a/Pipfile b/Pipfile
@@ -57,6 +57,7 @@ setuptools-scm = "*"
 twine = "*"
 xlwt = "*"
 pytest-env = "*"
+pytest-cov = "*"
 
 [requires]
 python_version = "3.9"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/pytest.ini b/pytest.ini
diff --git a/tests/test_archive.py b/tests/test_archive.py
@@ -7,11 +7,13 @@
 
 def test_archive_clean_handle():
     """Test archive handle cleaning."""
-    assert utils.safe_ia_handle(utils.get_site("latimes")["handle"]) == "latimes"
-    assert (
-        utils.safe_ia_handle(utils.get_site("_fiquemsabendo")["handle"])
-        == "fiquemsabendo"
-    )
+
+    def _get_handle(x):
+        return utils.safe_ia_handle(utils.get_site(x)["handle"])
+
+    assert _get_handle("latimes") == "latimes"
+    assert _get_handle("_fiquemsabendo") == "fiquemsabendo"
+    assert _get_handle("CNN") == "cnn"
 
 
 def test_archive_now_local():