You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by av...@apache.org on 2020/12/14 15:14:55 UTC
[ignite] branch ignite-ducktape updated: IGNITE-13828: Change
ducktape dependency to own fork (#8555)
This is an automated email from the ASF dual-hosted git repository.
av pushed a commit to branch ignite-ducktape
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/ignite-ducktape by this push:
new 21f4c714 IGNITE-13828: Change ducktape dependency to own fork (#8555)
21f4c714 is described below
commit 21f4c71454d32d4f72d55d6f0aabd6490504e78c
Author: Sergei Ryzhov <s....@gmail.com>
AuthorDate: Mon Dec 14 18:14:30 2020 +0300
IGNITE-13828: Change ducktape dependency to own fork (#8555)
---
modules/ducktests/tests/docker/requirements.txt | 2 +-
modules/ducktests/tests/ignitetest/services/spark.py | 4 ++--
modules/ducktests/tests/ignitetest/services/utils/ignite_aware.py | 8 ++++----
modules/ducktests/tests/ignitetest/services/zk/zookeeper.py | 4 ++--
modules/ducktests/tests/setup.py | 4 ++--
modules/ducktests/tests/tox.ini | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/modules/ducktests/tests/docker/requirements.txt b/modules/ducktests/tests/docker/requirements.txt
index e209504..06f73eb 100644
--- a/modules/ducktests/tests/docker/requirements.txt
+++ b/modules/ducktests/tests/docker/requirements.txt
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-git+https://github.com/confluentinc/ducktape
+git+https://github.com/Sberbank-Technology/ducktape
diff --git a/modules/ducktests/tests/ignitetest/services/spark.py b/modules/ducktests/tests/ignitetest/services/spark.py
index 77756eb..09e99ac 100644
--- a/modules/ducktests/tests/ignitetest/services/spark.py
+++ b/modules/ducktests/tests/ignitetest/services/spark.py
@@ -55,8 +55,8 @@ class SparkService(BackgroundThreadService, PersistenceAware):
"collect_default": True
}
- def start(self):
- BackgroundThreadService.start(self)
+ def start(self, clean=True):
+ BackgroundThreadService.start(self, clean=clean)
self.logger.info("Waiting for Spark to start...")
diff --git a/modules/ducktests/tests/ignitetest/services/utils/ignite_aware.py b/modules/ducktests/tests/ignitetest/services/utils/ignite_aware.py
index 513e0e5..43fca2f 100644
--- a/modules/ducktests/tests/ignitetest/services/utils/ignite_aware.py
+++ b/modules/ducktests/tests/ignitetest/services/utils/ignite_aware.py
@@ -62,14 +62,14 @@ class IgniteAwareService(BackgroundThreadService, IgnitePersistenceAware, metacl
self.disconnected_nodes = []
self.killed = False
- def start_async(self):
+ def start_async(self, clean=True):
"""
Starts in async way.
"""
- super().start()
+ super().start(clean=clean)
- def start(self):
- self.start_async()
+ def start(self, clean=True):
+ self.start_async(clean=clean)
self.await_started()
def await_started(self):
diff --git a/modules/ducktests/tests/ignitetest/services/zk/zookeeper.py b/modules/ducktests/tests/ignitetest/services/zk/zookeeper.py
index cad575d..baf8848 100644
--- a/modules/ducktests/tests/ignitetest/services/zk/zookeeper.py
+++ b/modules/ducktests/tests/ignitetest/services/zk/zookeeper.py
@@ -63,8 +63,8 @@ class ZookeeperService(Service):
self.settings = settings
self.start_timeout_sec = start_timeout_sec
- def start(self):
- super().start()
+ def start(self, clean=True):
+ super().start(clean=clean)
self.logger.info("Waiting for Zookeeper quorum...")
for node in self.nodes:
diff --git a/modules/ducktests/tests/setup.py b/modules/ducktests/tests/setup.py
index ee2d839..7c658ee 100644
--- a/modules/ducktests/tests/setup.py
+++ b/modules/ducktests/tests/setup.py
@@ -30,8 +30,8 @@ setup(name="ignitetest",
license="apache2.0",
packages=find_packages(exclude=["ignitetest.tests", "ignitetest.tests.*"]),
include_package_data=True,
- install_requires=["ducktape==0.8.0"],
+ install_requires=["ducktape==0.8.1"],
tests_require=["pytest==6.0.1"],
dependency_links=[
- 'https://github.com/confluentinc/ducktape/tarball/master#egg=ducktape-0.8.0'
+ 'https://github.com/Sberbank-Technology/ducktape/tarball/master#egg=ducktape-0.8.1'
])
diff --git a/modules/ducktests/tests/tox.ini b/modules/ducktests/tests/tox.ini
index 92cc37c..f74d685 100644
--- a/modules/ducktests/tests/tox.ini
+++ b/modules/ducktests/tests/tox.ini
@@ -26,7 +26,7 @@ python =
envdir = {homedir}/.virtualenvs/ignite-ducktests-{envname}
deps =
-r ./docker/requirements-dev.txt
-recreate = False
+recreate = True
usedevelop = True
commands =
pytest {env:PYTESTARGS:} {posargs}