tox 5.0.0 and docker >= 7

Author: fcostaoliveira

pyproject.toml

@@ -47,6 +47,10 @@ ujson = ">=4.2.0"
 wheel = ">=0.43.0"
 docker = ">=7.1.0"
 
+[tool.poetry.group.dev.dependencies]
+tox-poetry-installer = {extras = ["poetry"], version = "^0.10.3"}
+docker = "^7.1.0"
+
 [build-system]
 requires = ["poetry_core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"

redis_benchmarks_specification/__common__/env.py

@@ -45,7 +45,7 @@
 
 # DB used to authenticate ( read-only/non-dangerous access only )
 REDIS_AUTH_SERVER_HOST = os.getenv("REDIS_AUTH_SERVER_HOST", "localhost")
-REDIS_AUTH_SERVER_PORT = int(os.getenv("REDIS_AUTH_SERVER_PORT", "6380"))
+REDIS_AUTH_SERVER_PORT = int(os.getenv("REDIS_AUTH_SERVER_PORT", "6379"))
 REDIS_HEALTH_CHECK_INTERVAL = int(os.getenv("REDIS_HEALTH_CHECK_INTERVAL", "15"))
 REDIS_SOCKET_TIMEOUT = int(os.getenv("REDIS_SOCKET_TIMEOUT", "300"))
 REDIS_BINS_EXPIRE_SECS = int(

tox.ini

@@ -9,32 +9,35 @@ envlist = integration-tests
 basepython = python3
 
 [testenv:integration-tests]
-deps = -r{toxinidir}/dev_requirements.txt
-passenv = TST_BUILDER_X,TST_RUNNER_X,GH_TOKEN,TST_REDIS_DIR,DOCKER_HOST,DOCKER_TLS_VERIFY,DOCKER_CERT_PATH
+
 docker =
     datasink
     db_server
 
-commands =
- black --check redis_benchmarks_specification
- #flake8 redis_benchmarks_specification
- coverage erase
- coverage run --include=redis_benchmarks_specification/* -m pytest -ra {posargs}
- coverage report -m
+deps = 
+    -r{toxinidir}/dev_requirements.txt
+# passenv = TST_BUILDER_X,TST_RUNNER_X,GH_TOKEN,TST_REDIS_DIR,DOCKER_HOST,DOCKER_TLS_VERIFY,DOCKER_CERT_PATH
 
+stoponfail = 
+    True
+
+commands =
+    black --check redis_benchmarks_specification
+    #flake8 redis_benchmarks_specification
+    coverage erase
+    coverage run --include=redis_benchmarks_specification/* -m pytest -ra {posargs}
+    coverage report -m
 
 
 [docker]
 docker_host = unix:///var/run/docker.sock
 
-
-
 [docker:datasink]
 image = redis/redis-stack-server:7.4.0-v0
-ports =
-    16379:6379/tcp
+expose =
+    DATASINK_PORT=6379/tcp
 
 [docker:db_server]
 image = redis/redis-stack-server:7.4.0-v0
 ports =
-    6380:6379/tcp
+    DBSERVER_PORT=6379/tcp

utils/tests/test_api.py

@@ -26,7 +26,7 @@ def test_commit_schema_to_stream():
     assert result == False
     assert error_msg is not None
     try:
-        conn = redis.StrictRedis(port=16379)
+        conn = redis.StrictRedis(port=6379)
         conn.ping()
         conn.flushall()
         result, reply_fields, error_msg = commit_schema_to_stream(

utils/tests/test_app.py

@@ -21,7 +21,7 @@
 
 def test_create_app():
     try:
-        conn = redis.StrictRedis(port=16379, decode_responses=True)
+        conn = redis.StrictRedis(port=6379, decode_responses=True)
         conn.ping()
         conn.flushall()
         auth_token = conn.acl_genpass()

utils/tests/test_builder.py

@@ -40,7 +40,7 @@ def test_build_spec_image_prefetch():
 def test_commit_schema_to_stream_then_build():
     try:
         if should_run_builder():
-            conn = redis.StrictRedis(port=16379)
+            conn = redis.StrictRedis(port=6379)
             conn.ping()
             conn.flushall()
             builder_consumer_group_create(conn, "0")
@@ -91,7 +91,7 @@ def should_run_builder():
 def test_commit_schema_to_stream_then_build_historical_redis():
     try:
         if should_run_builder():
-            conn = redis.StrictRedis(port=16379)
+            conn = redis.StrictRedis(port=6379)
             conn.ping()
             conn.flushall()
             builder_consumer_group_create(conn, "0")

utils/tests/test_builder_schema.py

@@ -22,7 +22,7 @@
 def test_commit_schema_to_stream():
     try:
         if should_run_builder():
-            conn = redis.StrictRedis(port=16379)
+            conn = redis.StrictRedis(port=6379)
             conn.ping()
             conn.flushall()
             builder_consumer_group_create(conn, "0")

utils/tests/test_cli.py

@@ -28,6 +28,7 @@ def test_run_local_command_logic_oss_cluster():
         trigger_tests_cli_command_logic(args, "tool", "v0")
     except SystemExit as e:
         assert e.code == 1
+    db_port = os.getenv("DATASINK_PORT", "6379")
 
     # should error due to missing --use-tags or --use-branch
     parser = argparse.ArgumentParser(
@@ -36,7 +37,11 @@ def test_run_local_command_logic_oss_cluster():
     )
     parser = spec_cli_args(parser)
     TST_REDIS_DIR = os.getenv("TST_REDIS_DIR", None)
-    run_args = ["--use-tags"]
+    run_args = [
+        "--use-tags",
+        "--redis_port",
+        "{}".format(db_port),
+    ]
     if TST_REDIS_DIR is not None:
         run_args.extend(["--redis_repo", TST_REDIS_DIR])
     args = parser.parse_args(

utils/tests/test_runner.py

@@ -1,4 +1,5 @@
 import argparse
+import os
 
 import redis
 import yaml
@@ -187,10 +188,9 @@ def test_run_client_runner_logic():
         get_version_string(project_name, project_version)
     )
     db_host = "localhost"
-    db_port = "6380"
-    datasink_port = "16379"
+    db_port = os.getenv("DATASINK_PORT", "6379")
+    datasink_port = os.getenv("DATASINK_PORT", "6379")
     db_port_int = int(db_port)
-    datasink_port_int = int(db_port)
     args = parser.parse_args(
         args=[
             "--test",
@@ -209,7 +209,7 @@ def test_run_client_runner_logic():
 
     r = redis.Redis(host=db_host, port=db_port_int)
     total_keys = r.info("keyspace")["db0"]["keys"]
-    assert total_keys == 2
+    assert total_keys >= 2
 
     # run while pushing to redistimeseries
     args = parser.parse_args(
@@ -235,7 +235,7 @@ def test_run_client_runner_logic():
 
     r = redis.Redis(host=db_host, port=db_port_int)
     total_keys = r.info("keyspace")["db0"]["keys"]
-    assert total_keys == 2
+    assert total_keys >= 2
     rts = redis.Redis(host=db_host, port=db_port_int)
     total_keys = rts.info("keyspace")["db0"]["keys"]
     assert total_keys > 0

utils/tests/test_self_contained_coordinator.py

@@ -96,7 +96,7 @@ def test_self_contained_coordinator_blocking_read():
         if TST_RUNNER_X == "0":
             run_coordinator = False
         if run_coordinator:
-            conn = redis.StrictRedis(port=16379)
+            conn = redis.StrictRedis(port=6379)
             conn.ping()
             expected_datapoint_ts = None
             conn.flushall()
@@ -113,7 +113,7 @@ def test_self_contained_coordinator_blocking_read():
             running_platform = "fco-ThinkPad-T490"
 
             build_runners_consumer_group_create(conn, running_platform, "0")
-            datasink_conn = redis.StrictRedis(port=16379)
+            datasink_conn = redis.StrictRedis(port=6379)
             rts = datasink_conn.ts()
             docker_client = docker.from_env()
             home = str(Path.home())