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.

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

Revise proxy configuration, add integration testing #325

Merged
merged 32 commits into from
Mar 21, 2024
Merged
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
0d2ef35
Add integration tests with proxy
jhamon Mar 19, 2024
c36f4b7
Adjust working dir for github actions
jhamon Mar 19, 2024
9662045
Update docs
jhamon Mar 19, 2024
c228cde
Add debug output in tests
jhamon Mar 19, 2024
8ee2695
Simplify compose up
jhamon Mar 19, 2024
8ab5da0
Iterate on test setup
jhamon Mar 19, 2024
1e4555c
More debug output
jhamon Mar 19, 2024
e5f0130
More debug output
jhamon Mar 19, 2024
88a8c62
List running containers
jhamon Mar 19, 2024
9f5f036
Adjust docker volumes
jhamon Mar 19, 2024
8ac4bdf
Revert "Adjust docker volumes"
jhamon Mar 19, 2024
da52763
Adjust volume config
jhamon Mar 19, 2024
4653d03
Remove name from compose file
jhamon Mar 19, 2024
74ee9e7
Consolidate docker run into same step as test run
jhamon Mar 19, 2024
8786d3d
Experiment: file permissions
jhamon Mar 19, 2024
0b97dd3
Docker compose with no daemon option
jhamon Mar 19, 2024
3c24904
Adjust user permissions
jhamon Mar 19, 2024
b9517f2
Remove docker compose
jhamon Mar 20, 2024
677d282
Adjust urls
jhamon Mar 20, 2024
0e51730
Remove files accidentally committed
jhamon Mar 20, 2024
174816c
Upload test log as artifacts
jhamon Mar 20, 2024
a6a1e9e
Log docker status
jhamon Mar 20, 2024
cb3ad73
Adjust sleep
jhamon Mar 20, 2024
87092a5
Bump upload-artifact
jhamon Mar 20, 2024
edfb88c
Temporarily comment other tests
jhamon Mar 20, 2024
72dd0b2
Temporarily keep containers after they exit
jhamon Mar 20, 2024
c3a6566
Adjust log out
jhamon Mar 20, 2024
e05923e
Disable proxy tests in CI
jhamon Mar 21, 2024
9714afd
Reenable other tests
jhamon Mar 21, 2024
a057145
Update README
jhamon Mar 21, 2024
70b2d9a
Update READMe
jhamon Mar 21, 2024
5450689
Add inline comments
jhamon Mar 21, 2024
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
Adjust urls
  • Loading branch information
jhamon committed Mar 20, 2024
commit 677d282d7bcb5031bcabbdb7e01ab66c387c02ed
6 changes: 3 additions & 3 deletions tests/integration/proxy_config/test_proxy_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
from urllib3 import make_headers
from urllib3.exceptions import InsecureRequestWarning

PROXY1_URL_HTTPS = 'https://localhost:8080'
PROXY1_URL_HTTP = 'http://localhost:8080'
PROXY1_URL_HTTPS = 'https://127.0.0.1:8080'
PROXY1_URL_HTTP = 'http://127.0.0.1:8080'

PROXY2_URL = 'https://localhost:8081'
PROXY2_URL = 'https://127.0.0.1:8081'

def exercise_all_apis(client, index_name):
# Control plane
Expand Down
Loading