Skip to content

Commit

Permalink
Merge pull request #1078 from golemfactory/0.10-to-master
Browse files Browse the repository at this point in the history
0.10 to master
  • Loading branch information
shadeofblue authored Dec 22, 2022
2 parents 8cf9efd + 0b08da0 commit 39882e0
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ attrs = ">=19.3"
# It will be then installable with `poetry install -E integration-tests`.
# Note that putting `goth` in `poetry.dev-dependencies` instead of `poetry.dependencies`
# would not work: see https://github.com/python-poetry/poetry/issues/129.
goth = { version = "^0.13", optional = true, python = "^3.8.0" }
goth = { version = "^0.14", optional = true, python = "^3.8.0" }
# goth = { git = "https://github.com/golemfactory/goth.git", branch = "master", optional = true, python = "^3.8.0", develop = true }
Deprecated = "^1.2.12"
python-statemachine = "^0.8.0"
Expand Down
1 change: 1 addition & 0 deletions tests/goth_tests/test_recycle_ip/test_recycle_ip.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
SUBNET_TAG = "goth"


@pytest.mark.skip # TODO: https://github.com/golemfactory/yagna/issues/2387
@pytest.mark.asyncio
async def test_recycle_ip(
log_dir: Path,
Expand Down
2 changes: 1 addition & 1 deletion tests/goth_tests/test_run_ssh.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
SUBNET_TAG = "goth"


@pytest.mark.skip # TODO: we probably need to fix the way the requestor process are spawned #1020 # noqa
@pytest.mark.skip # TODO: https://github.com/golemfactory/yagna/issues/2387
@pytest.mark.asyncio
async def test_run_ssh(
log_dir: Path,
Expand Down
1 change: 1 addition & 0 deletions tests/goth_tests/test_run_webapp.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
ONELINER_URL = f"http://localhost:{port}/"


@pytest.mark.skip # TODO: https://github.com/golemfactory/yagna/issues/2387
@pytest.mark.asyncio
async def test_run_webapp(
log_dir: Path,
Expand Down

0 comments on commit 39882e0

Please sign in to comment.