Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DISCO-2028] Cache weather reports in Redis #202

Merged
merged 4 commits into from
Feb 24, 2023
Merged

[DISCO-2028] Cache weather reports in Redis #202

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
61513e4
fix: specify the `api_key` setting in the `accuweather` section
linabutler Feb 16, 2023
93629f0
test: launch a Redis container for contract tests
linabutler Feb 16, 2023
4855726
feat: cache weather reports in Redis
linabutler Feb 16, 2023
d62ff4c
test: add new unit tests for cached weather suggestions
linabutler Feb 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test: launch a Redis container for contract tests
  • Loading branch information
@linabutler
linabutler committed Feb 22, 2023
commit 93629f039398f293afb253095b5ebff9cd2d7389
4 changes: 2 additions & 2 deletions tests/contract/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ This directory contains source code for automated contract tests for Merino.
## Overview

The contract test suite is designed to be set up as a docker-compose CI workflow.
To simulate common use cases, the suite utilizes 5 docker containers: `client`,
`merino`, `kinto-setup`, `kinto` & `kinto-attachments`.
To simulate common use cases, the suite utilizes 6 docker containers: `client`,
`merino`, `kinto-setup`, `kinto`, `kinto-attachments`, and `redis`.

The following sequence diagram depicts container interactions during the
`remote_settings__coffee` test scenario.
Expand Down
9 changes: 9 additions & 0 deletions tests/contract/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ services:
- kinto
- kinto-attachments
- kinto-setup
- redis
volumes:
- ../../dev:/tmp/dev
- ../../dev/wait-for-it.sh:/wait-for-it.sh
entrypoint: /wait-for-it.sh
command: >
redis:6379 --strict -- uvicorn merino.main:app --proxy-headers --host 0.0.0.0 --port 8000

client:
image: client
Expand Down Expand Up @@ -72,3 +77,7 @@ services:
KINTO_COLLECTION: quicksuggest
command: >
/wait-for-it.sh kinto:8888 --strict -- python main.py

redis:
image: redis
container_name: redis