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/07/23 13:45:49 UTC
[ignite] branch ignite-ducktape updated: cleanup
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 c84478f cleanup
c84478f is described below
commit c84478fa5787628d907a048888f485cd95d1fdd4
Author: Anton Vinogradov <av...@apache.org>
AuthorDate: Thu Jul 23 16:45:17 2020 +0300
cleanup
---
.../{ => tests}/DataGenerationApplication.java | 2 +-
.../LongTxStreamerApplication.java | 2 +-
.../SingleKeyTxStreamerApplication.java | 2 +-
.../SampleDataStreamerApplication.java | 2 +-
.../spark_integration_test}/SparkApplication.java | 2 +-
modules/ducktests/tests/ignitetest/services/ignite.py | 2 +-
.../ducktests/tests/ignitetest/services/ignite_app.py | 4 +---
.../tests/ignitetest/services/ignite_spark_app.py | 2 +-
modules/ducktests/tests/ignitetest/services/spark.py | 2 +-
.../tests/ignitetest/services/utils/ignite_path.py | 2 +-
.../tests/{benchmarks => }/add_node_rebalance_test.py | 4 ++--
.../tests/ignitetest/tests/benchmarks/__init__.py | 14 --------------
.../ducktests/tests/ignitetest/tests/discovery_test.py | 5 ++---
.../tests/{benchmarks => }/pme_free_switch_test.py | 6 +++---
.../tests/ignitetest/tests/spark_integration_test.py | 18 ++++++++++--------
.../tests/ignitetest/{ => tests/utils}/version.py | 0
16 files changed, 27 insertions(+), 42 deletions(-)
diff --git a/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/DataGenerationApplication.java b/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/DataGenerationApplication.java
similarity index 97%
rename from modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/DataGenerationApplication.java
rename to modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/DataGenerationApplication.java
index 4c5ffcf..c1661d2 100644
--- a/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/DataGenerationApplication.java
+++ b/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/DataGenerationApplication.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.ducktest;
+package org.apache.ignite.internal.ducktest.tests;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
diff --git a/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/LongTxStreamerApplication.java b/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/pme_free_switch_test/LongTxStreamerApplication.java
similarity index 97%
rename from modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/LongTxStreamerApplication.java
rename to modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/pme_free_switch_test/LongTxStreamerApplication.java
index de3dbc7..14b96a8 100644
--- a/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/LongTxStreamerApplication.java
+++ b/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/pme_free_switch_test/LongTxStreamerApplication.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.ducktest;
+package org.apache.ignite.internal.ducktest.tests.pme_free_switch_test;
import java.util.Collection;
import java.util.concurrent.CountDownLatch;
diff --git a/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/SingleKeyTxStreamerApplication.java b/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/pme_free_switch_test/SingleKeyTxStreamerApplication.java
similarity index 97%
rename from modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/SingleKeyTxStreamerApplication.java
rename to modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/pme_free_switch_test/SingleKeyTxStreamerApplication.java
index bff4e7e..42e4d24 100644
--- a/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/SingleKeyTxStreamerApplication.java
+++ b/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/pme_free_switch_test/SingleKeyTxStreamerApplication.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.ducktest;
+package org.apache.ignite.internal.ducktest.tests.pme_free_switch_test;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
diff --git a/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/SampleDataStreamerApplication.java b/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/spark_integration_test/SampleDataStreamerApplication.java
similarity index 96%
rename from modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/SampleDataStreamerApplication.java
rename to modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/spark_integration_test/SampleDataStreamerApplication.java
index 281d202..691953c 100644
--- a/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/SampleDataStreamerApplication.java
+++ b/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/spark_integration_test/SampleDataStreamerApplication.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.ducktest;
+package org.apache.ignite.internal.ducktest.tests.spark_integration_test;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
diff --git a/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/SparkApplication.java b/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/spark_integration_test/SparkApplication.java
similarity index 98%
rename from modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/SparkApplication.java
rename to modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/spark_integration_test/SparkApplication.java
index 57d1754..565b85e 100644
--- a/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/SparkApplication.java
+++ b/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/spark_integration_test/SparkApplication.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.ducktest;
+package org.apache.ignite.internal.ducktest.tests.spark_integration_test;
import org.apache.ignite.internal.ducktest.utils.IgniteAwareApplication;
import org.apache.ignite.spark.IgniteDataFrameSettings;
diff --git a/modules/ducktests/tests/ignitetest/services/ignite.py b/modules/ducktests/tests/ignitetest/services/ignite.py
index e68d0bb..375c2ad 100644
--- a/modules/ducktests/tests/ignitetest/services/ignite.py
+++ b/modules/ducktests/tests/ignitetest/services/ignite.py
@@ -20,7 +20,7 @@ from ducktape.cluster.remoteaccount import RemoteCommandError
from ducktape.utils.util import wait_until
from ignitetest.services.utils.ignite_aware import IgniteAwareService
-from ignitetest.version import DEV_BRANCH
+from ignitetest.tests.utils.version import DEV_BRANCH
class IgniteService(IgniteAwareService):
diff --git a/modules/ducktests/tests/ignitetest/services/ignite_app.py b/modules/ducktests/tests/ignitetest/services/ignite_app.py
index 237436d..a073fb3 100644
--- a/modules/ducktests/tests/ignitetest/services/ignite_app.py
+++ b/modules/ducktests/tests/ignitetest/services/ignite_app.py
@@ -13,10 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from ducktape.services.service import Service
-
from ignitetest.services.utils.ignite_aware_app import IgniteAwareApplicationService
-from ignitetest.version import DEV_BRANCH
+from ignitetest.tests.utils.version import DEV_BRANCH
"""
The Ignite application service allows to perform custom logic writen on java.
diff --git a/modules/ducktests/tests/ignitetest/services/ignite_spark_app.py b/modules/ducktests/tests/ignitetest/services/ignite_spark_app.py
index c2f0496..5cc66c3 100644
--- a/modules/ducktests/tests/ignitetest/services/ignite_spark_app.py
+++ b/modules/ducktests/tests/ignitetest/services/ignite_spark_app.py
@@ -17,7 +17,7 @@
The Ignite-Spark application service.
"""
from ignitetest.services.utils.ignite_aware_app import IgniteAwareApplicationService
-from ignitetest.version import DEV_BRANCH
+from ignitetest.tests.utils.version import DEV_BRANCH
class SparkIgniteApplicationService(IgniteAwareApplicationService):
diff --git a/modules/ducktests/tests/ignitetest/services/spark.py b/modules/ducktests/tests/ignitetest/services/spark.py
index 731bcd5..1ac937d 100644
--- a/modules/ducktests/tests/ignitetest/services/spark.py
+++ b/modules/ducktests/tests/ignitetest/services/spark.py
@@ -20,7 +20,7 @@ from ducktape.services.service import Service
from ignitetest.services.utils.ignite_aware import IgniteAwareService
from ignitetest.services.utils.ignite_config import IgniteConfig
-from ignitetest.version import DEV_BRANCH
+from ignitetest.tests.utils.version import DEV_BRANCH
class SparkService(IgniteAwareService):
diff --git a/modules/ducktests/tests/ignitetest/services/utils/ignite_path.py b/modules/ducktests/tests/ignitetest/services/utils/ignite_path.py
index ed1a3fb..8e4603a 100644
--- a/modules/ducktests/tests/ignitetest/services/utils/ignite_path.py
+++ b/modules/ducktests/tests/ignitetest/services/utils/ignite_path.py
@@ -15,7 +15,7 @@
import os
-from ignitetest.version import get_version, IgniteVersion
+from ignitetest.tests.utils.version import get_version, IgniteVersion
"""
This module provides Ignite path methods
diff --git a/modules/ducktests/tests/ignitetest/tests/benchmarks/add_node_rebalance_test.py b/modules/ducktests/tests/ignitetest/tests/add_node_rebalance_test.py
similarity index 96%
rename from modules/ducktests/tests/ignitetest/tests/benchmarks/add_node_rebalance_test.py
rename to modules/ducktests/tests/ignitetest/tests/add_node_rebalance_test.py
index ba5b324..a558638 100644
--- a/modules/ducktests/tests/ignitetest/tests/benchmarks/add_node_rebalance_test.py
+++ b/modules/ducktests/tests/ignitetest/tests/add_node_rebalance_test.py
@@ -19,7 +19,7 @@ from ducktape.mark.resource import cluster
from ignitetest.services.ignite import IgniteService
from ignitetest.services.ignite_app import IgniteApplicationService
from ignitetest.tests.utils.ignite_test import IgniteTest
-from ignitetest.version import DEV_BRANCH, IgniteVersion, LATEST
+from ignitetest.tests.utils.version import DEV_BRANCH, IgniteVersion, LATEST
class AddNodeRebalanceTest(IgniteTest):
@@ -69,7 +69,7 @@ class AddNodeRebalanceTest(IgniteTest):
# This client just put some data to the cache.
IgniteApplicationService(self.test_context,
- java_class_name="org.apache.ignite.internal.ducktest.DataGenerationApplication",
+ java_class_name="org.apache.ignite.internal.ducktest.tests.DataGenerationApplication",
properties=self.properties(client_mode="true"),
version=ignite_version,
params="test-cache,%d" % self.DATA_AMOUNT,
diff --git a/modules/ducktests/tests/ignitetest/tests/benchmarks/__init__.py b/modules/ducktests/tests/ignitetest/tests/benchmarks/__init__.py
deleted file mode 100644
index ec20143..0000000
--- a/modules/ducktests/tests/ignitetest/tests/benchmarks/__init__.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
diff --git a/modules/ducktests/tests/ignitetest/tests/discovery_test.py b/modules/ducktests/tests/ignitetest/tests/discovery_test.py
index dd25205..246416a 100644
--- a/modules/ducktests/tests/ignitetest/tests/discovery_test.py
+++ b/modules/ducktests/tests/ignitetest/tests/discovery_test.py
@@ -16,13 +16,12 @@ import random
from ducktape.mark import parametrize
from ducktape.mark.resource import cluster
+from jinja2 import Template
from ignitetest.services.ignite import IgniteService
from ignitetest.services.zk.zookeeper import ZookeeperService
-from ignitetest.version import DEV_BRANCH, LATEST_2_7
from ignitetest.tests.utils.ignite_test import IgniteTest
-
-from jinja2 import Template
+from ignitetest.tests.utils.version import DEV_BRANCH, LATEST_2_7
class DiscoveryTest(IgniteTest):
diff --git a/modules/ducktests/tests/ignitetest/tests/benchmarks/pme_free_switch_test.py b/modules/ducktests/tests/ignitetest/tests/pme_free_switch_test.py
similarity index 95%
rename from modules/ducktests/tests/ignitetest/tests/benchmarks/pme_free_switch_test.py
rename to modules/ducktests/tests/ignitetest/tests/pme_free_switch_test.py
index d06b603..89653e9 100644
--- a/modules/ducktests/tests/ignitetest/tests/benchmarks/pme_free_switch_test.py
+++ b/modules/ducktests/tests/ignitetest/tests/pme_free_switch_test.py
@@ -20,7 +20,7 @@ from ducktape.mark.resource import cluster
from ignitetest.services.ignite import IgniteService
from ignitetest.services.ignite_app import IgniteApplicationService
from ignitetest.tests.utils.ignite_test import IgniteTest
-from ignitetest.version import DEV_BRANCH, LATEST_2_7, V_2_8_0, IgniteVersion
+from ignitetest.tests.utils.version import DEV_BRANCH, LATEST_2_7, V_2_8_0, IgniteVersion
class PmeFreeSwitchTest(IgniteTest):
@@ -72,7 +72,7 @@ class PmeFreeSwitchTest(IgniteTest):
long_tx_streamer = IgniteApplicationService(
self.test_context,
- java_class_name="org.apache.ignite.internal.ducktest.LongTxStreamerApplication",
+ java_class_name="org.apache.ignite.internal.ducktest.tests.pme_free_switch_test.LongTxStreamerApplication",
properties=self.properties(client_mode="true"),
params="test-cache",
version=ignite_version)
@@ -83,7 +83,7 @@ class PmeFreeSwitchTest(IgniteTest):
single_key_tx_streamer = IgniteApplicationService(
self.test_context,
- java_class_name="org.apache.ignite.internal.ducktest.SingleKeyTxStreamerApplication",
+ java_class_name="org.apache.ignite.internal.ducktest.tests.pme_free_switch_test.SingleKeyTxStreamerApplication",
properties=self.properties(client_mode="true"),
params="test-cache,1000",
version=ignite_version)
diff --git a/modules/ducktests/tests/ignitetest/tests/spark_integration_test.py b/modules/ducktests/tests/ignitetest/tests/spark_integration_test.py
index 4fa46bb..45c0a38 100644
--- a/modules/ducktests/tests/ignitetest/tests/spark_integration_test.py
+++ b/modules/ducktests/tests/ignitetest/tests/spark_integration_test.py
@@ -50,14 +50,16 @@ class SparkIntegrationTest(IgniteTest):
def test_spark_client(self):
self.stage("Starting sample data generator")
- IgniteApplicationService(self.test_context,
- java_class_name="org.apache.ignite.internal.ducktest.SampleDataStreamerApplication",
- params="cache,1000",
- properties=self.properties(client_mode="true")).run()
+ IgniteApplicationService(
+ self.test_context,
+ java_class_name="org.apache.ignite.internal.ducktest.tests.spark_integration_test.SampleDataStreamerApplication",
+ params="cache,1000",
+ properties=self.properties(client_mode="true")).run()
self.stage("Starting Spark application")
- SparkIgniteApplicationService(self.test_context,
- "org.apache.ignite.internal.ducktest.SparkApplication",
- params="spark://" + self.spark.nodes[0].account.hostname + ":7077",
- timeout_sec=120).run()
+ SparkIgniteApplicationService(
+ self.test_context,
+ "org.apache.ignite.internal.ducktest.tests.spark_integration_test.SparkApplication",
+ params="spark://" + self.spark.nodes[0].account.hostname + ":7077",
+ timeout_sec=120).run()
diff --git a/modules/ducktests/tests/ignitetest/version.py b/modules/ducktests/tests/ignitetest/tests/utils/version.py
similarity index 100%
rename from modules/ducktests/tests/ignitetest/version.py
rename to modules/ducktests/tests/ignitetest/tests/utils/version.py