diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 303b036377..d4719f900b 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -19,9 +19,10 @@ jobs: SERVICE_ACCOUNT_BACKEND_URL: redis://localhost:6379/4 CACHE_URL: redis://localhost:6379/3 ENKETO_REDIS_MAIN_URL: redis://localhost:6379/0 + KOBOCAT_MEDIA_ROOT: /tmp/media strategy: matrix: - python-version: ['3.8', '3.10'] + python-version: ['3.10'] services: postgres: image: postgis/postgis:14-3.4 @@ -59,8 +60,9 @@ jobs: - name: Test back-end code # Explicitly name the directories where coverage should be measured; # specifying just `--cov=.` includes `src`, which contains third-party packages - run: pytest --cov=hub --cov=kobo --cov=kpi -ra - - name: Run coveralls for back-end code - uses: AndreMiras/coveralls-python-action@develop - # Coveralls action will intermittently give 422 errors - until that issue is resolved this step allowed to error. - continue-on-error: true + run: pytest -vv --disable-warnings kobo/apps/openrosa/apps/viewer/tests/test_exports.py::TestExports::test_create_export +# run: pytest --cov=hub --cov=kobo --cov=kpi -ra +# - name: Run coveralls for back-end code +# uses: AndreMiras/coveralls-python-action@develop +# # Coveralls action will intermittently give 422 errors - until that issue is resolved this step allowed to error. +# continue-on-error: true diff --git a/kobo/apps/openrosa/apps/logger/models/xform.py b/kobo/apps/openrosa/apps/logger/models/xform.py index abc4e87aaa..4b47070a21 100644 --- a/kobo/apps/openrosa/apps/logger/models/xform.py +++ b/kobo/apps/openrosa/apps/logger/models/xform.py @@ -47,9 +47,8 @@ def upload_to(instance, filename): return os.path.join( - instance.user.username, - 'xls', - os.path.split(filename)[1]) + instance.user.username, 'xls', os.path.split(filename)[1] + ) class XFormWithoutPendingDeletedManager(models.Manager): diff --git a/kobo/settings/base.py b/kobo/settings/base.py index bbe71a0606..98cffd1d53 100644 --- a/kobo/settings/base.py +++ b/kobo/settings/base.py @@ -1362,7 +1362,7 @@ def dj_stripe_request_callback_method(): } else: KOBOCAT_DEFAULT_FILE_STORAGE = global_settings.STORAGES['default']['BACKEND'] - KOBOCAT_MEDIA_PATH = os.environ.get('KOBOCAT_MEDIA_PATH', '/srv/src/kobocat/media') + KOBOCAT_MEDIA_ROOT = os.environ.get('KOBOCAT_MEDIA_ROOT', MEDIA_ROOT) # Google Cloud Storage # Not fully supported as a generic storage backend diff --git a/kobo/settings/testing.py b/kobo/settings/testing.py index 2605d27343..4ae7e54ea8 100644 --- a/kobo/settings/testing.py +++ b/kobo/settings/testing.py @@ -26,7 +26,6 @@ # Run all Celery tasks synchronously during testing CELERY_TASK_ALWAYS_EAGER = True - MONGO_CONNECTION_URL = 'mongodb://fakehost/formhub_test' mongo_client = MockMongoClient( MONGO_CONNECTION_URL, connect=False, journal=True, tz_aware=True diff --git a/kpi/deployment_backends/kc_access/shadow_models.py b/kpi/deployment_backends/kc_access/shadow_models.py index 32555f6fac..d049437ad6 100644 --- a/kpi/deployment_backends/kc_access/shadow_models.py +++ b/kpi/deployment_backends/kc_access/shadow_models.py @@ -179,7 +179,7 @@ def protected_path(self, format_: Optional[str] = None): # (out of ASCII character set) and must be encoded to let NGINX serve # them protected_url = urlquote(attachment_file_path.replace( - settings.KOBOCAT_MEDIA_PATH, '/protected') + settings.KOBOCAT_MEDIA_ROOT, '/protected') ) else: # Double-encode the S3 URL to take advantage of NGINX's diff --git a/kpi/deployment_backends/kc_access/storage.py b/kpi/deployment_backends/kc_access/storage.py index db613aaf04..690e634604 100644 --- a/kpi/deployment_backends/kc_access/storage.py +++ b/kpi/deployment_backends/kc_access/storage.py @@ -32,7 +32,7 @@ def __init__( directory_permissions_mode=None, ): location = ( - django_settings.KOBOCAT_MEDIA_PATH if not location else location + django_settings.KOBOCAT_MEDIA_ROOT if not location else location ) super().__init__( location=location,