Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
jctanner committed Oct 8, 2024
1 parent e7391e6 commit 691b3a0
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
10 changes: 0 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -188,13 +188,3 @@ oci/dab:
.PHONY: oci/dab_jwt
oci/dab_jwt:
dev/oci_start dab_jwt

################################################
# UNIT TESTING
################################################

postgres/up:
docker compose -f local_dev.yml up -d postgres

postgres/down:
docker compose -f local_dev.yml down -v postgres
5 changes: 5 additions & 0 deletions galaxy_ng/tests/unit/api/test_localization.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import logging

from django.core.management import call_command

from galaxy_ng.app.constants import DeploymentMode
from galaxy_ng.app.models import auth as auth_models

Expand Down Expand Up @@ -84,6 +86,9 @@ def test_auto_localization(self):
)

def test_localization_files(self):

call_command('compilemessages')

with self.settings(GALAXY_DEPLOYMENT_MODE=DeploymentMode.STANDALONE.value):
self.client.force_authenticate(user=self.admin_user)

Expand Down
5 changes: 5 additions & 0 deletions local_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ x-common-env: &common-env
# role content workaround ..
PULP_ANSIBLE_BASE_ROLES_REQUIRE_VIEW: 'false'

POSTGRES_LOGGING_COLLECTOR: 'true'
POSTGRES_LOG_DESTINATION: 'stderr'
POSTGRES_LOG_STATEMENT: 'all'
POSTGRES_LOG_MIN_DURATION_STATEMENT: '0'


services:
postgres:
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ legacy_tox_ini = """
PULP_FILE_UPLOAD_TEMP_DIR=/tmp/pulp/artifact-tmp
commands =
sh -c ' \
docker compose -f local_dev.yml up -d postgres && \
docker compose -f local_dev.yml exec postgres bash -c "while ! pg_isready -U galaxy_ng; do sleep 1; done" && \
rm -rf /tmp/pulp && \
mkdir -p /tmp/pulp && \
mkdir -p /tmp/pulp/tmp && \
Expand All @@ -133,7 +135,6 @@ legacy_tox_ini = """
--capture=no -v \
-p 'no:pulpcore' \
-p 'no:pulp_ansible' \
-k 'test_me_get' \
--pyargs "galaxy_ng.tests.unit" \
'
"""

0 comments on commit 691b3a0

Please sign in to comment.