Minor style changes and removed unnecesary comments
parent
f96d6a04b6
commit
b96e2c314a
|
@ -139,9 +139,10 @@ class Container:
|
|||
while True:
|
||||
try:
|
||||
logs = self.cntr.logs()
|
||||
except docker.errors.NotFound:
|
||||
return False
|
||||
except docker.errors.APIError:
|
||||
except (
|
||||
docker.errors.NotFound,
|
||||
docker.errors.APIError
|
||||
):
|
||||
return False
|
||||
|
||||
entries = logs.decode().split('\n')
|
||||
|
|
|
@ -14,22 +14,11 @@
|
|||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
'''
|
||||
``elasticsearch`` integration.
|
||||
|
||||
- client management routines
|
||||
- ticK data ingest routines
|
||||
- websocket client for subscribing to write triggers
|
||||
- todo: tick sequence stream-cloning for testing
|
||||
|
||||
'''
|
||||
from __future__ import annotations
|
||||
from contextlib import asynccontextmanager as acm
|
||||
from pprint import pformat
|
||||
from typing import (
|
||||
Any,
|
||||
# Optional,
|
||||
#Union,
|
||||
TYPE_CHECKING,
|
||||
)
|
||||
|
||||
|
|
|
@ -9,8 +9,9 @@ from piker.log import get_logger
|
|||
from elasticsearch import Elasticsearch
|
||||
from piker.data import marketstore
|
||||
|
||||
def test_marketstore(
|
||||
def test_marketstore_startup_and_version(
|
||||
open_test_pikerd: AsyncContextManager,
|
||||
loglevel,
|
||||
):
|
||||
|
||||
'''
|
||||
|
@ -24,7 +25,7 @@ def test_marketstore(
|
|||
|
||||
async with (
|
||||
open_test_pikerd(
|
||||
loglevel='info',
|
||||
loglevel=loglevel,
|
||||
tsdb=True
|
||||
) as (s, i, pikerd_portal, services),
|
||||
marketstore.get_client() as client
|
||||
|
@ -39,8 +40,9 @@ def test_marketstore(
|
|||
trio.run(main)
|
||||
|
||||
|
||||
def test_elasticsearch(
|
||||
def test_elasticsearch_startup_and_version(
|
||||
open_test_pikerd: AsyncContextManager,
|
||||
loglevel,
|
||||
):
|
||||
'''
|
||||
Verify elasticsearch starts correctly
|
||||
|
@ -53,7 +55,7 @@ def test_elasticsearch(
|
|||
port = 19200
|
||||
|
||||
async with open_test_pikerd(
|
||||
loglevel='info',
|
||||
loglevel=loglevel,
|
||||
es=True
|
||||
) as (s, i, pikerd_portal, services):
|
||||
|
||||
|
|
Loading…
Reference in New Issue