Skip to content

Commit 8006ed0

Browse files
committed
Fix formatting and skip tests in default CI pipelines
1 parent 190f651 commit 8006ed0

File tree

5 files changed

+32
-27
lines changed

5 files changed

+32
-27
lines changed

tests/scenario/__init__.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
import dataclasses
12
import json
23
import os.path
3-
import dataclasses
4+
from urllib.parse import urlparse
45

56
import pytest
6-
from urllib.parse import urlparse
77

88

99
@dataclasses.dataclass
@@ -38,7 +38,9 @@ def get_endpoint(request: pytest.FixtureRequest, endpoint_name: str) -> Endpoint
3838
endpoints_config_path = request.config.getoption("--endpoints-config")
3939

4040
if not (endpoints_config_path and os.path.exists(endpoints_config_path)):
41-
raise ValueError(f"Endpoints config file not found: {endpoints_config_path}")
41+
raise FileNotFoundError(
42+
f"Endpoints config file not found: {endpoints_config_path}"
43+
)
4244

4345
try:
4446
with open(endpoints_config_path, "r") as f:

tests/scenario/fake_app.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import multiprocessing
22
import typing
3-
4-
from threading import Thread, Event
5-
from multiprocessing import Process, Event as PEvent
3+
from multiprocessing import Event as PEvent
4+
from multiprocessing import Process
5+
from threading import Event, Thread
66
from unittest.mock import patch
77

88
from redis import Redis

tests/scenario/test_connection_interruptions.py

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,17 @@
11
import multiprocessing
2-
3-
import socket
42
import time
53

64
import pytest
7-
8-
9-
from redis import Redis, BusyLoadingError
5+
from redis import BusyLoadingError, Redis
106
from redis.backoff import ExponentialBackoff
7+
from redis.exceptions import ConnectionError as RedisConnectionError
8+
from redis.exceptions import TimeoutError as RedisTimeoutError
119
from redis.retry import Retry
12-
from redis.exceptions import (
13-
ConnectionError as RedisConnectionError,
14-
TimeoutError as RedisTimeoutError,
15-
)
1610

1711
from ..conftest import _get_client
18-
from . import get_endpoint, Endpoint
12+
from . import Endpoint, get_endpoint
1913
from .fake_app import FakeApp, FakeSubscriber
20-
from .fault_injection_client import FaultInjectionClient, TriggeredAction
14+
from .fault_injection_client import FaultInjectionClient
2115

2216

2317
@pytest.fixture
@@ -27,7 +21,12 @@ def endpoint_name():
2721

2822
@pytest.fixture
2923
def endpoint(request: pytest.FixtureRequest, endpoint_name: str):
30-
return get_endpoint(request, endpoint_name)
24+
try:
25+
return get_endpoint(request, endpoint_name)
26+
except FileNotFoundError as e:
27+
pytest.skip(
28+
f"Skipping scenario test because endpoints file is missing: {str(e)}"
29+
)
3130

3231

3332
@pytest.fixture

tests/test_asyncio/scenario/fake_app.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import typing
2-
3-
from asyncio import create_task, Event, Task
2+
from asyncio import Event, Task, create_task
43
from unittest.mock import patch
54

65
from redis.asyncio import Redis

tests/test_asyncio/scenario/test_connection_interruptions.py

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import asyncio
2-
import pytest
32

4-
from redis.asyncio import Redis, BusyLoadingError
5-
from redis.backoff import ExponentialBackoff
3+
import pytest
4+
from redis.asyncio import BusyLoadingError, Redis
65
from redis.asyncio.retry import Retry
7-
from redis.exceptions import ConnectionError as RedisConnectionError, TimeoutError
6+
from redis.backoff import ExponentialBackoff
7+
from redis.exceptions import ConnectionError as RedisConnectionError
8+
from redis.exceptions import TimeoutError
9+
from tests.scenario import Endpoint, get_endpoint
810

9-
from ..conftest import create_redis
10-
from tests.scenario import get_endpoint, Endpoint
1111
from .fake_app import AsyncFakeApp, AsyncFakeSubscriber
1212
from .fault_injection_client import AsyncFaultInjectionClient
1313

@@ -19,7 +19,12 @@ async def endpoint_name():
1919

2020
@pytest.fixture
2121
async def endpoint(request: pytest.FixtureRequest, endpoint_name: str):
22-
return get_endpoint(request, endpoint_name)
22+
try:
23+
return get_endpoint(request, endpoint_name)
24+
except FileNotFoundError as e:
25+
pytest.skip(
26+
f"Skipping scenario test because endpoints file is missing: {str(e)}"
27+
)
2328

2429

2530
@pytest.fixture

0 commit comments

Comments
 (0)