Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • hive/test-tools
1 result
Select Git revision
Show changes
Commits on Source (3)
......@@ -2,7 +2,7 @@ from __future__ import annotations
from typing import TYPE_CHECKING, Any
from helpy import Hived
from helpy import Hived, Settings
from helpy._communication.request_communicator import RequestCommunicator
from test_tools.__private.scope import context
from test_tools.__private.user_handles.implementation import Implementation as UserHandleImplementation
......@@ -15,7 +15,7 @@ if TYPE_CHECKING:
class BaseNode(UserHandleImplementation, Hived):
def __init__(self, *, name: str, handle: NodeHandleBase | None = None) -> None:
self.__name = context.names.register_numbered_name(name)
super().__init__(handle=handle, communicator=RequestCommunicator())
super().__init__(handle=handle, settings=Settings(communicator=RequestCommunicator()))
def __str__(self) -> str:
return self.__name
......
......@@ -104,7 +104,9 @@ class BlockLog:
return BlockLog(Path(output_directory) / "block_log")
def __run_and_get_output(self, *args: str) -> str:
process = subprocess.run([paths_to_executables.get_path_of("block_log_util"), *args], capture_output=True)
process = subprocess.run(
[paths_to_executables.get_path_of("block_log_util"), *args], capture_output=True, check=False
)
if process.returncode:
raise BlockLogUtilError(
......
......@@ -68,7 +68,9 @@ class Node(BaseNode, ScopedObject):
return self.directory / "config.ini"
def __create_notifications_server(self) -> NodeNotificationServer:
return NodeNotificationServer(self.get_name(), self.logger.bind(notifications=True))
return NodeNotificationServer(
node_name=self.get_name(), logger=self.logger.bind(notifications=True), settings=self.settings
)
def is_running(self) -> bool:
return self.__process.is_running()
......
......@@ -8,14 +8,17 @@ from test_tools.__private.notifications.node_notification_handler import NodeNot
if TYPE_CHECKING:
from loguru import Logger
from helpy import Settings
class NodeNotificationServer(UniversalNotificationServer):
def __init__(self, node_name: str, logger: Logger) -> None:
def __init__(self, node_name: str, logger: Logger, settings: Settings) -> None:
self.__logger = logger
self.__node_name = node_name
self.__handler = NodeNotificationHandler(node_name=self.__node_name, logger=logger)
super().__init__(
self.__handler,
settings=settings,
thread_name=f"{self.__node_name}.NotificationServerThread",
)
......
......@@ -181,6 +181,24 @@ docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-
tests = ["attrs[tests-no-zope]", "zope-interface"]
tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"]
[[package]]
name = "beekeepy"
version = "1.25.2rc0.dev3890+04a94d629.dirty"
description = ""
optional = false
python-versions = ">=3.10,<4.0"
files = [
{file = "beekeepy-1.25.2rc0.dev3890+04a94d629.dirty-py3-none-any.whl", hash = "sha256:0710fc068e83b0a971da5d074b8c7d928b09ae672744fbb3460b46f9cf846ea5"},
]
[package.dependencies]
helpy = "0.0.1.dev163+09dbdfa"
[package.source]
type = "legacy"
url = "https://gitlab.syncad.com/api/v4/projects/198/packages/pypi/simple"
reference = "gitlab-beekeepy"
[[package]]
name = "black"
version = "22.8.0"
......@@ -440,12 +458,12 @@ hyperframe = ">=6.0,<7"
[[package]]
name = "helpy"
version = "0.0.1.dev162+b5dcc6c"
version = "0.0.1.dev163+09dbdfa"
description = "Easily interact with the Hive blockchain using Python."
optional = false
python-versions = ">=3.10,<4.0"
files = [
{file = "helpy-0.0.1.dev162+b5dcc6c-py3-none-any.whl", hash = "sha256:48a0740def8bfaa7da886b8fccde18bf6a4804da4da965b52789e9b4797ffe16"},
{file = "helpy-0.0.1.dev163+09dbdfa-py3-none-any.whl", hash = "sha256:20285928d451b3336a2573ab5f741d337720d8dfd9e974fff3998a123fb47e1a"},
]
[package.dependencies]
......@@ -455,7 +473,7 @@ loguru = "0.7.2"
pytest-is-running = "1.5.0"
python-dateutil = "2.8.2"
requests = "2.27.1"
schemas = "0.0.1.dev292+bcba095"
schemas = "0.0.1.dev293+ec86a3c"
wax = "0.0.3a2.dev187+207f9b4"
[package.source]
......@@ -1118,12 +1136,12 @@ files = [
[[package]]
name = "schemas"
version = "0.0.1.dev292+bcba095"
version = "0.0.1.dev293+ec86a3c"
description = "Tools for checking if message fits expected format"
optional = false
python-versions = ">=3.10,<4.0"
files = [
{file = "schemas-0.0.1.dev292+bcba095-py3-none-any.whl", hash = "sha256:b7a053f9bc227ee82a1cfbac5dcd76e57624bdc9f804c1aa2a7d3c144dc48488"},
{file = "schemas-0.0.1.dev293+ec86a3c-py3-none-any.whl", hash = "sha256:dcc30eff2587ed209ce38e2beb8e783ec5b0199d4590a0eed4723ef7e0e868b9"},
]
[package.dependencies]
......@@ -1363,4 +1381,4 @@ multidict = ">=4.0"
[metadata]
lock-version = "2.0"
python-versions = "^3.10"
content-hash = "c29158a2b1ebbd06d91943a2cfbdc05975ac4b0936e86eb4748f4bb283904335"
content-hash = "cffdacf42aaaf49e2a197b8ecf6343c87a51d9071aa888fef67f9cb6a57bfa86"
......@@ -15,6 +15,7 @@ source = [
{ name = "gitlab-schemas", url = "https://gitlab.syncad.com/api/v4/projects/362/packages/pypi/simple", priority = "supplemental" },
{ name = "gitlab-wax", url = "https://gitlab.syncad.com/api/v4/projects/419/packages/pypi/simple", priority = "supplemental" },
{ name = "gitlab-helpy", url = "https://gitlab.syncad.com/api/v4/projects/434/packages/pypi/simple", priority = "supplemental" },
{ name = "gitlab-beekeepy", url = "https://gitlab.syncad.com/api/v4/projects/198/packages/pypi/simple", priority = "supplemental" },
]
packages = [
{ include = "test_tools", from = "package" },
......@@ -27,7 +28,7 @@ requests = "2.27.1"
python-dateutil = "2.8.2"
abstractcp = "0.9.9"
loguru = "0.7.2"
helpy = "0.0.1.dev162+b5dcc6c"
beekeepy = "1.25.2rc0.dev3890+04a94d629.dirty"
[tool.poetry.group.dev.dependencies]
......