Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions tests/opentelemetry-docker-tests/tests/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:
otmongo:
ports:
Expand Down
12 changes: 0 additions & 12 deletions tests/opentelemetry-docker-tests/tests/test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ amqp==5.2.0
asgiref==3.8.1
async-timeout==4.0.3
asyncpg==0.29.0
attrs==23.2.0
bcrypt==5.0.0
billiard==4.2.0
celery==5.3.6
Expand All @@ -15,21 +14,15 @@ click-didyoumean==0.3.0
click-plugins==1.1.1
click-repl==0.3.0
cryptography==46.0.7
distro==1.9.0
Django==4.2.30
dnspython==2.6.1
docker==5.0.3
docker-compose==1.29.2
dockerpty==0.4.1
docopt==0.6.2
exceptiongroup==1.2.0
flaky==3.7.0
flask==3.1.3
greenlet==3.0.3
grpcio==1.63.2
idna==3.7
iniconfig==2.0.0
jsonschema==3.2.0
kombu==5.3.5
mysql-connector-python==8.3.0
mysqlclient==2.1.1
Expand All @@ -50,24 +43,19 @@ PyMySQL==1.1.1
PyNaCl==1.6.2
# prerequisite: install unixodbc
pyodbc==5.0.1
pyrsistent==0.20.0
pytest==8.0.2
pytest-celery==0.0.0
python-dateutil==2.9.0.post0
python-dotenv==0.21.1
pytz==2024.1
PyYAML==5.3.1
redis==5.0.1
requests==2.31.0
six==1.16.0
SQLAlchemy==1.4.52
texttable==1.7.0
tomli==2.0.1
typing_extensions==4.12.2
tzdata==2024.1
urllib3==1.26.19
vine==5.1.0
wcwidth==0.2.13
websocket-client==0.59.0
wrapt==1.16.0
zipp==3.19.1
14 changes: 11 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1081,17 +1081,25 @@ deps =
changedir =
tests/opentelemetry-docker-tests/tests

allowlist_externals =
docker
pytest
sh

commands_pre =
sh -c "sudo apt update -y && sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18 unixodbc-dev unixodbc"
; this assumes an ubuntu system
sh -c "sudo apt update -y"
sh -c "docker --version || sudo apt install -y docker.io docker-compose-v2"
sh -c "sudo ACCEPT_EULA=Y apt install -y msodbcsql18 unixodbc-dev unixodbc"
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can make tests optional and move dependency install in CI

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

python -c "import pyodbc; print(pyodbc.drivers())"
docker-compose up -d
docker compose up -d
python check_availability.py

commands =
pytest {posargs}

commands_post =
docker-compose down -v
docker compose down -v

[testenv:generate]
deps =
Expand Down
Loading