Skip to content

Commit 263e8bf

Browse files
change compose files and removed the need for docker compose down
1 parent 4d4c1ac commit 263e8bf

File tree

4 files changed

+22
-8
lines changed

4 files changed

+22
-8
lines changed

.github/workflows/test.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,25 @@ jobs:
5858
run: poetry install --no-interaction
5959

6060
- name: install docker module for python
61-
run: pip install docker
61+
run: poetry add docker
6262

63+
- name: wait for nodes to connect to each other
64+
run: while true;do (docker logs node0 | grep succeeded ) && ( docker logs node1 | grep succeeded ) && break ;done
65+
66+
- name: Get logs from node1
67+
run: docker logs node0
68+
69+
- name: Get logs from node1
70+
run: docker logs node1
71+
72+
- name: Get logs from node5
73+
run: docker logs node5
74+
75+
- name: Get logs from redis-server-2
76+
run: docker logs redis-server-2
6377
- name: Run Tests
6478
run: poetry run pytest --cov --cov-report=xml
65-
79+
6680
- name: Upload coverage
6781
uses: codecov/codecov-action@v5
6882
if: matrix.python == '3.10' && matrix.platform != 'macos-11'

docker/cluster-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ services:
1616
interval: 3s
1717
timeout: 10s
1818
retries: 10
19-
start_period: 2s
19+
start_period: 1s
2020
environment:
2121
REDIS_ARGS: "--port 5000 --cluster-enabled yes --cluster-port 16379 --cluster-preferred-endpoint-type hostname --cluster-config-file /data/nodes.conf --cluster-node-timeout 500 --cluster-announce-hostname node0"
2222

docker/sentinel-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ services:
8484
networks:
8585
- redis-sentinel
8686
environment:
87-
REDIS_ARGS: "--port 6381 --replica-announce-ip redis-server-1 --replica-announce-port 6381 --replicaof redis-server-1 6380"
87+
REDIS_ARGS: "--port 6381 --replica-announce-ip redis-server-2 --replica-announce-port 6381 --replicaof redis-server-1 6380"
8888
BROWSER: 0
8989

9090
networks:

tests/test_get_replica_connections.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from falkordb import FalkorDB
55
import docker
66

7+
78
CLUSTER_PORT = 5000
89
STANDALONE_PORT = 6379
910
SENTINEL_PORT = 26379
@@ -43,9 +44,8 @@ def stop_replicas(client):
4344
stop_container(name)
4445

4546
def start_replicas(replicas: list):
46-
for i in replicas:
47-
name = i[0]
48-
start_container(name)
47+
for replica in replicas:
48+
start_container(replica)
4949

5050
def test_get_replica_connections_cluster():
5151
c = cluster_client()
@@ -77,7 +77,7 @@ def test_get_replica_connections_cluster_no_replicas():
7777
def test_get_replica_connections_sentinel_no_replicas():
7878
# Assume this Sentinel setup has no replicas
7979
stop_replicas(sentinel_client())
80-
time.sleep(40)
80+
time.sleep(2)
8181
c = sentinel_client()
8282
assert c.get_replica_connections() == []
8383
start_replicas(["redis-server-2"])

0 commit comments

Comments
 (0)