From 45c585b4f7e3d5e5dd5297b4d121badbd2052922 Mon Sep 17 00:00:00 2001 From: Grant Henke Date: Sun, 3 Apr 2016 20:04:36 -0700 Subject: [PATCH] KAFKA-3483: Restructure ducktape tests to simplify running subsets of tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … tests Author: Grant Henke Reviewers: Geoff Anderson , Ewen Cheslack-Postava Closes #1162 from granthenke/ducktape-structure --- tests/kafkatest/benchmarks/__init__.py | 14 ++++++++++++++ tests/kafkatest/benchmarks/core/__init__.py | 15 +++++++++++++++ .../{tests => benchmarks/core}/benchmark_test.py | 0 tests/kafkatest/tests/client/__init__.py | 15 +++++++++++++++ .../tests/{ => client}/compression_test.py | 0 .../{ => client}/consumer_rolling_upgrade_test.py | 0 .../kafkatest/tests/{ => client}/consumer_test.py | 0 .../{ => client}/message_format_change_test.py | 0 tests/kafkatest/tests/{ => client}/quota_test.py | 0 tests/kafkatest/tests/connect/__init__.py | 15 +++++++++++++++ .../{ => connect}/connect_distributed_test.py | 0 .../tests/{ => connect}/connect_rest_test.py | 0 .../kafkatest/tests/{ => connect}/connect_test.py | 0 .../templates/connect-distributed.properties | 0 .../templates/connect-file-sink.properties | 0 .../templates/connect-file-source.properties | 0 .../templates/connect-standalone.properties | 0 tests/kafkatest/tests/core/__init__.py | 15 +++++++++++++++ .../compatibility_test_new_broker_test.py | 0 .../{ => core}/consumer_group_command_test.py | 0 .../tests/{ => core}/get_offset_shell_test.py | 0 .../tests/{ => core}/mirror_maker_test.py | 0 .../tests/{ => core}/reassign_partitions_test.py | 0 .../tests/{ => core}/replication_test.py | 0 .../{ => core}/security_rolling_upgrade_test.py | 0 .../{ => core}/simple_consumer_shell_test.py | 0 tests/kafkatest/tests/{ => core}/upgrade_test.py | 0 .../{ => core}/zookeeper_security_upgrade_test.py | 0 tests/kafkatest/tests/streams/__init__.py | 15 +++++++++++++++ .../tests/{ => streams}/streams_bounce_test.py | 0 .../tests/{ => streams}/streams_smoke_test.py | 0 tests/kafkatest/tests/tools/__init__.py | 15 +++++++++++++++ .../tests/{ => tools}/log4j_appender_test.py | 0 33 files changed, 104 insertions(+) create mode 100644 tests/kafkatest/benchmarks/__init__.py create mode 100644 tests/kafkatest/benchmarks/core/__init__.py rename tests/kafkatest/{tests => benchmarks/core}/benchmark_test.py (100%) create mode 100644 tests/kafkatest/tests/client/__init__.py rename tests/kafkatest/tests/{ => client}/compression_test.py (100%) rename tests/kafkatest/tests/{ => client}/consumer_rolling_upgrade_test.py (100%) rename tests/kafkatest/tests/{ => client}/consumer_test.py (100%) rename tests/kafkatest/tests/{ => client}/message_format_change_test.py (100%) rename tests/kafkatest/tests/{ => client}/quota_test.py (100%) create mode 100644 tests/kafkatest/tests/connect/__init__.py rename tests/kafkatest/tests/{ => connect}/connect_distributed_test.py (100%) rename tests/kafkatest/tests/{ => connect}/connect_rest_test.py (100%) rename tests/kafkatest/tests/{ => connect}/connect_test.py (100%) rename tests/kafkatest/tests/{ => connect}/templates/connect-distributed.properties (100%) rename tests/kafkatest/tests/{ => connect}/templates/connect-file-sink.properties (100%) rename tests/kafkatest/tests/{ => connect}/templates/connect-file-source.properties (100%) rename tests/kafkatest/tests/{ => connect}/templates/connect-standalone.properties (100%) create mode 100644 tests/kafkatest/tests/core/__init__.py rename tests/kafkatest/tests/{ => core}/compatibility_test_new_broker_test.py (100%) rename tests/kafkatest/tests/{ => core}/consumer_group_command_test.py (100%) rename tests/kafkatest/tests/{ => core}/get_offset_shell_test.py (100%) rename tests/kafkatest/tests/{ => core}/mirror_maker_test.py (100%) rename tests/kafkatest/tests/{ => core}/reassign_partitions_test.py (100%) rename tests/kafkatest/tests/{ => core}/replication_test.py (100%) rename tests/kafkatest/tests/{ => core}/security_rolling_upgrade_test.py (100%) rename tests/kafkatest/tests/{ => core}/simple_consumer_shell_test.py (100%) rename tests/kafkatest/tests/{ => core}/upgrade_test.py (100%) rename tests/kafkatest/tests/{ => core}/zookeeper_security_upgrade_test.py (100%) create mode 100644 tests/kafkatest/tests/streams/__init__.py rename tests/kafkatest/tests/{ => streams}/streams_bounce_test.py (100%) rename tests/kafkatest/tests/{ => streams}/streams_smoke_test.py (100%) create mode 100644 tests/kafkatest/tests/tools/__init__.py rename tests/kafkatest/tests/{ => tools}/log4j_appender_test.py (100%) diff --git a/tests/kafkatest/benchmarks/__init__.py b/tests/kafkatest/benchmarks/__init__.py new file mode 100644 index 00000000000..ec2014340d7 --- /dev/null +++ b/tests/kafkatest/benchmarks/__init__.py @@ -0,0 +1,14 @@ +# 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/tests/kafkatest/benchmarks/core/__init__.py b/tests/kafkatest/benchmarks/core/__init__.py new file mode 100644 index 00000000000..ebc9bb3a9a0 --- /dev/null +++ b/tests/kafkatest/benchmarks/core/__init__.py @@ -0,0 +1,15 @@ +# 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. +# see kafka.server.KafkaConfig for additional details and defaults diff --git a/tests/kafkatest/tests/benchmark_test.py b/tests/kafkatest/benchmarks/core/benchmark_test.py similarity index 100% rename from tests/kafkatest/tests/benchmark_test.py rename to tests/kafkatest/benchmarks/core/benchmark_test.py diff --git a/tests/kafkatest/tests/client/__init__.py b/tests/kafkatest/tests/client/__init__.py new file mode 100644 index 00000000000..ebc9bb3a9a0 --- /dev/null +++ b/tests/kafkatest/tests/client/__init__.py @@ -0,0 +1,15 @@ +# 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. +# see kafka.server.KafkaConfig for additional details and defaults diff --git a/tests/kafkatest/tests/compression_test.py b/tests/kafkatest/tests/client/compression_test.py similarity index 100% rename from tests/kafkatest/tests/compression_test.py rename to tests/kafkatest/tests/client/compression_test.py diff --git a/tests/kafkatest/tests/consumer_rolling_upgrade_test.py b/tests/kafkatest/tests/client/consumer_rolling_upgrade_test.py similarity index 100% rename from tests/kafkatest/tests/consumer_rolling_upgrade_test.py rename to tests/kafkatest/tests/client/consumer_rolling_upgrade_test.py diff --git a/tests/kafkatest/tests/consumer_test.py b/tests/kafkatest/tests/client/consumer_test.py similarity index 100% rename from tests/kafkatest/tests/consumer_test.py rename to tests/kafkatest/tests/client/consumer_test.py diff --git a/tests/kafkatest/tests/message_format_change_test.py b/tests/kafkatest/tests/client/message_format_change_test.py similarity index 100% rename from tests/kafkatest/tests/message_format_change_test.py rename to tests/kafkatest/tests/client/message_format_change_test.py diff --git a/tests/kafkatest/tests/quota_test.py b/tests/kafkatest/tests/client/quota_test.py similarity index 100% rename from tests/kafkatest/tests/quota_test.py rename to tests/kafkatest/tests/client/quota_test.py diff --git a/tests/kafkatest/tests/connect/__init__.py b/tests/kafkatest/tests/connect/__init__.py new file mode 100644 index 00000000000..ebc9bb3a9a0 --- /dev/null +++ b/tests/kafkatest/tests/connect/__init__.py @@ -0,0 +1,15 @@ +# 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. +# see kafka.server.KafkaConfig for additional details and defaults diff --git a/tests/kafkatest/tests/connect_distributed_test.py b/tests/kafkatest/tests/connect/connect_distributed_test.py similarity index 100% rename from tests/kafkatest/tests/connect_distributed_test.py rename to tests/kafkatest/tests/connect/connect_distributed_test.py diff --git a/tests/kafkatest/tests/connect_rest_test.py b/tests/kafkatest/tests/connect/connect_rest_test.py similarity index 100% rename from tests/kafkatest/tests/connect_rest_test.py rename to tests/kafkatest/tests/connect/connect_rest_test.py diff --git a/tests/kafkatest/tests/connect_test.py b/tests/kafkatest/tests/connect/connect_test.py similarity index 100% rename from tests/kafkatest/tests/connect_test.py rename to tests/kafkatest/tests/connect/connect_test.py diff --git a/tests/kafkatest/tests/templates/connect-distributed.properties b/tests/kafkatest/tests/connect/templates/connect-distributed.properties similarity index 100% rename from tests/kafkatest/tests/templates/connect-distributed.properties rename to tests/kafkatest/tests/connect/templates/connect-distributed.properties diff --git a/tests/kafkatest/tests/templates/connect-file-sink.properties b/tests/kafkatest/tests/connect/templates/connect-file-sink.properties similarity index 100% rename from tests/kafkatest/tests/templates/connect-file-sink.properties rename to tests/kafkatest/tests/connect/templates/connect-file-sink.properties diff --git a/tests/kafkatest/tests/templates/connect-file-source.properties b/tests/kafkatest/tests/connect/templates/connect-file-source.properties similarity index 100% rename from tests/kafkatest/tests/templates/connect-file-source.properties rename to tests/kafkatest/tests/connect/templates/connect-file-source.properties diff --git a/tests/kafkatest/tests/templates/connect-standalone.properties b/tests/kafkatest/tests/connect/templates/connect-standalone.properties similarity index 100% rename from tests/kafkatest/tests/templates/connect-standalone.properties rename to tests/kafkatest/tests/connect/templates/connect-standalone.properties diff --git a/tests/kafkatest/tests/core/__init__.py b/tests/kafkatest/tests/core/__init__.py new file mode 100644 index 00000000000..ebc9bb3a9a0 --- /dev/null +++ b/tests/kafkatest/tests/core/__init__.py @@ -0,0 +1,15 @@ +# 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. +# see kafka.server.KafkaConfig for additional details and defaults diff --git a/tests/kafkatest/tests/compatibility_test_new_broker_test.py b/tests/kafkatest/tests/core/compatibility_test_new_broker_test.py similarity index 100% rename from tests/kafkatest/tests/compatibility_test_new_broker_test.py rename to tests/kafkatest/tests/core/compatibility_test_new_broker_test.py diff --git a/tests/kafkatest/tests/consumer_group_command_test.py b/tests/kafkatest/tests/core/consumer_group_command_test.py similarity index 100% rename from tests/kafkatest/tests/consumer_group_command_test.py rename to tests/kafkatest/tests/core/consumer_group_command_test.py diff --git a/tests/kafkatest/tests/get_offset_shell_test.py b/tests/kafkatest/tests/core/get_offset_shell_test.py similarity index 100% rename from tests/kafkatest/tests/get_offset_shell_test.py rename to tests/kafkatest/tests/core/get_offset_shell_test.py diff --git a/tests/kafkatest/tests/mirror_maker_test.py b/tests/kafkatest/tests/core/mirror_maker_test.py similarity index 100% rename from tests/kafkatest/tests/mirror_maker_test.py rename to tests/kafkatest/tests/core/mirror_maker_test.py diff --git a/tests/kafkatest/tests/reassign_partitions_test.py b/tests/kafkatest/tests/core/reassign_partitions_test.py similarity index 100% rename from tests/kafkatest/tests/reassign_partitions_test.py rename to tests/kafkatest/tests/core/reassign_partitions_test.py diff --git a/tests/kafkatest/tests/replication_test.py b/tests/kafkatest/tests/core/replication_test.py similarity index 100% rename from tests/kafkatest/tests/replication_test.py rename to tests/kafkatest/tests/core/replication_test.py diff --git a/tests/kafkatest/tests/security_rolling_upgrade_test.py b/tests/kafkatest/tests/core/security_rolling_upgrade_test.py similarity index 100% rename from tests/kafkatest/tests/security_rolling_upgrade_test.py rename to tests/kafkatest/tests/core/security_rolling_upgrade_test.py diff --git a/tests/kafkatest/tests/simple_consumer_shell_test.py b/tests/kafkatest/tests/core/simple_consumer_shell_test.py similarity index 100% rename from tests/kafkatest/tests/simple_consumer_shell_test.py rename to tests/kafkatest/tests/core/simple_consumer_shell_test.py diff --git a/tests/kafkatest/tests/upgrade_test.py b/tests/kafkatest/tests/core/upgrade_test.py similarity index 100% rename from tests/kafkatest/tests/upgrade_test.py rename to tests/kafkatest/tests/core/upgrade_test.py diff --git a/tests/kafkatest/tests/zookeeper_security_upgrade_test.py b/tests/kafkatest/tests/core/zookeeper_security_upgrade_test.py similarity index 100% rename from tests/kafkatest/tests/zookeeper_security_upgrade_test.py rename to tests/kafkatest/tests/core/zookeeper_security_upgrade_test.py diff --git a/tests/kafkatest/tests/streams/__init__.py b/tests/kafkatest/tests/streams/__init__.py new file mode 100644 index 00000000000..ebc9bb3a9a0 --- /dev/null +++ b/tests/kafkatest/tests/streams/__init__.py @@ -0,0 +1,15 @@ +# 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. +# see kafka.server.KafkaConfig for additional details and defaults diff --git a/tests/kafkatest/tests/streams_bounce_test.py b/tests/kafkatest/tests/streams/streams_bounce_test.py similarity index 100% rename from tests/kafkatest/tests/streams_bounce_test.py rename to tests/kafkatest/tests/streams/streams_bounce_test.py diff --git a/tests/kafkatest/tests/streams_smoke_test.py b/tests/kafkatest/tests/streams/streams_smoke_test.py similarity index 100% rename from tests/kafkatest/tests/streams_smoke_test.py rename to tests/kafkatest/tests/streams/streams_smoke_test.py diff --git a/tests/kafkatest/tests/tools/__init__.py b/tests/kafkatest/tests/tools/__init__.py new file mode 100644 index 00000000000..ebc9bb3a9a0 --- /dev/null +++ b/tests/kafkatest/tests/tools/__init__.py @@ -0,0 +1,15 @@ +# 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. +# see kafka.server.KafkaConfig for additional details and defaults diff --git a/tests/kafkatest/tests/log4j_appender_test.py b/tests/kafkatest/tests/tools/log4j_appender_test.py similarity index 100% rename from tests/kafkatest/tests/log4j_appender_test.py rename to tests/kafkatest/tests/tools/log4j_appender_test.py