Skip to content

Commit ae3c021

Browse files
committed
Fix cloud-test conftest setup
recent change in auth tuple construction let this fail
1 parent 5f38a5e commit ae3c021

File tree

4 files changed

+57
-1
lines changed

4 files changed

+57
-1
lines changed

justfile

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,25 @@ it-v2 filter="" extra_options="":
2929
pytest tests/integrationV2 --include-integration-v2 --basetemp=tmp/ {{extra_options}} {{ if filter != "" { "-k '" + filter + "'" } else { "" } }}
3030

3131

32+
# runs the
33+
session-v1-it-tests:
34+
#!/usr/bin/env bash
35+
set -e
36+
ENV_DIR="scripts/test_envs/gds_session"
37+
trap "cd $ENV_DIR && docker compose down" EXIT
38+
cd $ENV_DIR && docker compose up -d
39+
cd -
40+
NEO4J_URI=bolt://localhost:7688 \
41+
NEO4J_USER=neo4j \
42+
NEO4J_PASSWORD=password \
43+
NEO4J_DB=neo4j \
44+
NEO4J_AURA_DB_URI=bolt://localhost:7687 \
45+
pytest tests --include-cloud-architecture
46+
47+
48+
49+
50+
3251
update-session:
3352
docker pull europe-west1-docker.pkg.dev/gds-aura-artefacts/gds/gds-session:latest
53+
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
services:
2+
gds-session:
3+
image: europe-west1-docker.pkg.dev/gds-aura-artefacts/gds/gds-session:latest # build locally if you dont want to use a released one
4+
volumes:
5+
- ./password:/passwords/password
6+
environment:
7+
- SESSION_ID=42
8+
- MODEL_STORAGE_BASE_LOCATION=/models
9+
- ALLOW_LIST=DEFAULT
10+
- DNS_NAME=gds-session
11+
- PAGE_CACHE_SIZE=100M
12+
ports:
13+
- "7688:7687"
14+
- "8080:8080"
15+
- "8491:8491"
16+
17+
18+
neo4j:
19+
image: neo4j:enterprise
20+
volumes:
21+
- ${HOME}/.gds_license:/licenses/.gds_license
22+
environment:
23+
- NEO4J_AUTH=none # for testing
24+
25+
- NEO4J_ACCEPT_LICENSE_AGREEMENT=yes
26+
27+
- NEO4J_server_metrics_prometheus_enabled=true
28+
- NEO4J_server_metrics_prometheus_endpoint=0.0.0.0:2004
29+
- NEO4J_server_metrics_filter=*
30+
- NEO4J_server_metrics_enabled=true
31+
ports:
32+
- "7474:7474"
33+
- "7687:7687"
34+
- "2004:2004"
35+
restart: always
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
password

tests/integration/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
if neo4j_user := os.environ.get("NEO4J_USER", os.environ.get("NEO4J_USERNAME", "neo4j")):
2121
AUTH = (
2222
neo4j_user,
23-
os.environ.get("NEO4J_PASSWORD", "neo4j"),
23+
os.environ.get("NEO4J_PASSWORD", "password"),
2424
)
2525

2626
DB = os.environ.get("NEO4J_DB", "neo4j")

0 commit comments

Comments
 (0)