maint: refactor test, eliminate duplicated test

templateflow · Sep 13, 2024 · dad314f · dad314f
1 parent 10fcecd
commit dad314f
Show file tree

Hide file tree

Showing 7 changed files with 230 additions and 270 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -108,14 +108,27 @@ jobs:
           pkg-manager: pip
           cache-version: v1
 
+      - run:
+          name: Run tests (config and others)
+          command: |
+            python -m pytest \
+                   --junit-xml=~/tests/conftests.xml --cov templateflow --cov-report xml:~/coverage/cov_config.xml \
+                   templateflow/tests/
+
+      - codecov/upload:
+          file: ~/coverage/cov_config.xml
+          flags: config
+          cli_args: "-e CIRCLE_JOB"
+          upload_name: General
+
       - run:
           name: Run tests (w/ DataLad)
           command: |
             mkdir -p ~/tests/ ~/coverage/
             export TEMPLATEFLOW_USE_DATALAD=on
             python -m pytest \
                    --junit-xml=~/tests/datalad.xml --cov templateflow --cov-report xml:~/coverage/cov_api_dl.xml \
-                   --doctest-modules templateflow/
+                   --doctest-modules templateflow/api.py
 
       - codecov/upload:
           file: ~/coverage/cov_api_dl.xml
@@ -154,19 +167,6 @@ jobs:
           cli_args: "-e CIRCLE_JOB"
           upload_name: Datalad-S3-bypass
 
-      - run:
-          name: Run tests (config, parameterized TEMPLATEFLOW_USE_DATALAD)
-          command: |
-            python -m pytest \
-                   --junit-xml=~/tests/conftests.xml --cov templateflow --cov-report xml:~/coverage/cov_config.xml \
-                   templateflow/conf/tests/test_conf.py
-
-      - codecov/upload:
-          file: ~/coverage/cov_config.xml
-          flags: config
-          cli_args: "-e CIRCLE_JOB"
-          upload_name: Config
-
       - store_test_results:
           path: ~/tests
 

diff --git a/templateflow/conf/tests/__init__.py b/templateflow/conf/tests/__init__.py
diff --git a/templateflow/conf/tests/test_conf.py b/templateflow/conf/tests/test_conf.py
diff --git a/templateflow/conf/tests/test_s3.py b/templateflow/conf/tests/test_s3.py
diff --git a/templateflow/tests/test_api.py b/templateflow/tests/test_api.py
@@ -24,7 +24,7 @@
 
 import pytest
 
-from .. import api
+from templateflow import api
 
 
 class Bibtex: