diff --git a/CHANGELOG.md b/CHANGELOG.md index 8940fa055..d4538a56e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [0.7.0] - 2021-09-09 + +### Breaking changes +- make default presets.json compatible with yagna 0.8+ [080a95f](https://github.com/golemfactory/goth/commit/080a95fd8c5b41b69da216cfdee6f0ac4dbe3acc) +- update mock zkSync server version [#544](https://github.com/golemfactory/goth/pull/544) + +### Features +- disconnect yagna containers before stopping Docker network [#540](https://github.com/golemfactory/goth/pull/540) +- enable creating detached API assertions [#538](https://github.com/golemfactory/goth/pull/538) +- enable MITM proxy for requestor probes [#535](https://github.com/golemfactory/goth/pull/535) + +### Other changes +- update `typing_extensions` to 3.10.0+ [cc956e1](https://github.com/golemfactory/goth/commit/cc956e14447b5d6f382b7f668e385fcee9c209be) + ## [0.6.3] - 2021-08-16 ### Bugfixes diff --git a/goth/default-assets/goth-config.yml b/goth/default-assets/goth-config.yml index ab1764ba7..4912fc5bc 100644 --- a/goth/default-assets/goth-config.yml +++ b/goth/default-assets/goth-config.yml @@ -15,7 +15,7 @@ docker-compose: # binary-path: ... # deb-path: ... - # branch: ... + branch: release/v0.8 # commit-hash: ... # release-tag: ... diff --git a/goth/default-assets/provider/presets.json b/goth/default-assets/provider/presets.json index 8b1abc77d..70586928f 100644 --- a/goth/default-assets/provider/presets.json +++ b/goth/default-assets/provider/presets.json @@ -1,27 +1,40 @@ { + "ver": "V1", "active": [ - "wasmtime", - "vm" + "wasm", + "vm", + "test-counters" ], "presets": [ { - "name": "wasmtime", + "name": "wasm", "exeunit-name": "wasmtime", "pricing-model": "linear", + "initial-price": 0, "usage-coeffs": { - "initial": 0.0, - "duration": 0.0002777777777777778, - "cpu": 0.001388888888888889 + "golem.usage.duration_sec": 0.0001, + "golem.usage.cpu_sec": 0.0001 } }, { "name": "vm", "exeunit-name": "vm", "pricing-model": "linear", + "initial-price": 0, "usage-coeffs": { - "initial": 0.0, - "cpu": 0.001388888888888889, - "duration": 0.0002777777777777778 + "golem.usage.duration_sec": 0.0001, + "golem.usage.cpu_sec": 0.0001 + } + }, + { + "name": "test-counters", + "exeunit-name": "test-counters", + "pricing-model": "linear", + "initial-price": 0, + "usage-coeffs": { + "golem.usage.duration_sec": 0.0001, + "golem.usage.cpu_sec": 0.0001, + "golem.usage.custom.counter": 0.0003 } } ] diff --git a/poetry.lock b/poetry.lock index 2211601fb..56814fcb2 100644 --- a/poetry.lock +++ b/poetry.lock @@ -211,7 +211,7 @@ python-versions = "*" [[package]] name = "docker" -version = "5.0.0" +version = "5.0.2" description = "A Python library for the Docker Engine API." category = "main" optional = false @@ -273,11 +273,11 @@ python-versions = "*" [[package]] name = "dpath" -version = "2.0.1" +version = "2.0.3" description = "Filesystem-like pathing and searching for dictionaries" category = "main" optional = false -python-versions = "*" +python-versions = ">=3" [[package]] name = "fastcore" @@ -1001,7 +1001,7 @@ python-versions = "*" [[package]] name = "typing-extensions" -version = "3.7.4.3" +version = "3.10.0.2" description = "Backported and Experimental Type Hints for Python 3.5+" category = "main" optional = false @@ -1098,7 +1098,7 @@ python-versions = "*" [metadata] lock-version = "1.1" python-versions = "^3.8" -content-hash = "0fa29a8fae1fc951e5f9d9062ef43284fde1296bbe43ae79fa107056f6bb0125" +content-hash = "68f0d3882853607c339f6b3fc6e4fecf54e7bed0a611b5a0cc0e9e963865abbf" [metadata.files] aiohttp = [ @@ -1310,8 +1310,8 @@ distro = [ {file = "distro-1.6.0.tar.gz", hash = "sha256:83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424"}, ] docker = [ - {file = "docker-5.0.0-py2.py3-none-any.whl", hash = "sha256:fc961d622160e8021c10d1bcabc388c57d55fb1f917175afbe24af442e6879bd"}, - {file = "docker-5.0.0.tar.gz", hash = "sha256:3e8bc47534e0ca9331d72c32f2881bb13b93ded0bcdeab3c833fb7cf61c0a9a5"}, + {file = "docker-5.0.2-py2.py3-none-any.whl", hash = "sha256:9b17f0723d83c1f3418d2aa17bf90b24dbe97deda06208dd4262fa30a6ee87eb"}, + {file = "docker-5.0.2.tar.gz", hash = "sha256:21ec4998e90dff7a7aaaa098ca8d839c7de412b89e6f6c30908372d58fecf663"}, ] docker-compose = [ {file = "docker-compose-1.29.2.tar.gz", hash = "sha256:4c8cd9d21d237412793d18bd33110049ee9af8dab3fe2c213bbd0733959b09b7"}, @@ -1324,7 +1324,8 @@ docopt = [ {file = "docopt-0.6.2.tar.gz", hash = "sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491"}, ] dpath = [ - {file = "dpath-2.0.1.tar.gz", hash = "sha256:bea06b5f4ff620a28dfc9848cf4d6b2bfeed34238edeb8ebe815c433b54eb1fa"}, + {file = "dpath-2.0.3-py3-none-any.whl", hash = "sha256:3d05c2e3125fc9f1b579a5276d2f47de90fbfc0f30b2b3e52cdad76cc3283c1c"}, + {file = "dpath-2.0.3.tar.gz", hash = "sha256:a7a89c32e747df3a9f2a446bb797472e359beba5339515b7a6f65b233b2a31a7"}, ] fastcore = [ {file = "fastcore-1.3.26-py3-none-any.whl", hash = "sha256:39d85ec9728dfc4423495a37e06adb8744e8896cca435f39a4e8ffa12a41c8ef"}, @@ -1923,9 +1924,9 @@ typed-ast = [ {file = "typed_ast-1.4.3.tar.gz", hash = "sha256:fb1bbeac803adea29cedd70781399c99138358c26d05fcbd23c13016b7f5ec65"}, ] typing-extensions = [ - {file = "typing_extensions-3.7.4.3-py2-none-any.whl", hash = "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f"}, - {file = "typing_extensions-3.7.4.3-py3-none-any.whl", hash = "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918"}, - {file = "typing_extensions-3.7.4.3.tar.gz", hash = "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c"}, + {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"}, + {file = "typing_extensions-3.10.0.2-py3-none-any.whl", hash = "sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34"}, + {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"}, ] urllib3 = [ {file = "urllib3-1.26.6-py2.py3-none-any.whl", hash = "sha256:39fb8672126159acb139a7718dd10806104dec1e2f0f6c88aab05d17df10c8d4"}, diff --git a/pyproject.toml b/pyproject.toml index 1ef4434c8..a402925f5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ exclude= '/(\.eggs|\.git|\.hg|\.mypy_cache|\.nox|\.tox|\.venv|venv|\.svn|_build| [tool.poetry] name = "goth" -version = "0.6.6" +version = "0.7.0" description = "Golem Test Harness - integration testing framework" authors = ["Golem Factory "] license = "GPL-3.0" @@ -26,13 +26,13 @@ python = "^3.8" aiohttp = "3.7.4" ansicolors = "^1.1.0" docker-compose = "^1.29" -docker = "=5.0.0" +docker = "^5.0" dpath = "^2.0" func_timeout = "4.3.5" mitmproxy = "^5.3" pyyaml = "^5.4" transitions = "^0.8" -typing_extensions = "3.7.4.3" +typing_extensions = "^3.10.0" urllib3 = "^1.26" ya-aioclient = "^0.6" ghapi = "^0.1.16" diff --git a/test/integration/conftest.py b/test/integration/conftest.py index fbae27dea..f90cd2904 100644 --- a/test/integration/conftest.py +++ b/test/integration/conftest.py @@ -8,7 +8,7 @@ from goth.runner.log import configure_logging -@pytest.fixture +@pytest.fixture(scope="session") def log_dir() -> Path: """Return path to dir where goth test session logs should be placed.""" base_dir = Path("/", "tmp", "goth-tests")