Skip to content

Commit ce3f662

Browse files
authored
ci: Continue on Allure error (#254)
1 parent a63d993 commit ce3f662

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

.github/workflows/unit-tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,13 @@ jobs:
5252
- name: Allure Report
5353
uses: firebolt-db/action-allure-report@v1
5454
if: always()
55+
continue-on-error: true
5556
with:
5657
github-key: ${{ secrets.GITHUB_TOKEN }}
5758

5859
- name: Upload coverage report
5960
uses: actions/upload-artifact@v2
61+
continue-on-error: true
6062
with:
6163
name: pytest-coverage-report
6264
path: coverage.xml

src/firebolt/async_db/connection.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import socket
55
from json import JSONDecodeError
66
from types import TracebackType
7-
from typing import Any, Dict, List, Optional
7+
from typing import Any, Dict, Iterable, List, Optional
88

99
from httpcore.backends.auto import AutoBackend
10-
from httpcore.backends.base import AsyncNetworkStream
10+
from httpcore.backends.base import SOCKET_OPTION, AsyncNetworkStream
1111
from httpx import AsyncHTTPTransport, HTTPStatusError, RequestError, Timeout
1212

1313
from firebolt.async_db.cursor import Cursor
@@ -140,6 +140,7 @@ async def connect_tcp(
140140
port: int,
141141
timeout: Optional[float] = None,
142142
local_address: Optional[str] = None,
143+
socket_options: Optional[Iterable[SOCKET_OPTION]] = None,
143144
) -> AsyncNetworkStream:
144145
stream = await super().connect_tcp(
145146
host, port, timeout=timeout, local_address=local_address

src/firebolt/db/connection.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import socket
55
from json import JSONDecodeError
66
from types import TracebackType
7-
from typing import Any, Dict, List, Optional
7+
from typing import Any, Dict, Iterable, List, Optional
88
from warnings import warn
99

10-
from httpcore.backends.base import NetworkStream
10+
from httpcore.backends.base import SOCKET_OPTION, NetworkStream
1111
from httpcore.backends.sync import SyncBackend
1212
from httpx import HTTPStatusError, HTTPTransport, RequestError, Timeout
1313
from readerwriterlock.rwlock import RWLockWrite
@@ -131,9 +131,14 @@ def connect_tcp(
131131
port: int,
132132
timeout: Optional[float] = None,
133133
local_address: Optional[str] = None,
134+
socket_options: Optional[Iterable[SOCKET_OPTION]] = None,
134135
) -> NetworkStream:
135136
stream = super().connect_tcp(
136-
host, port, timeout=timeout, local_address=local_address
137+
host,
138+
port,
139+
timeout=timeout,
140+
local_address=local_address,
141+
socket_options=socket_options,
137142
)
138143
# Enable keepalive
139144
stream.get_extra_info("socket").setsockopt(

0 commit comments

Comments
 (0)