From 595cc8e03aa046738fc6b5124f53f76f21e5688c Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 1 Aug 2019 10:57:22 -0400 Subject: [PATCH] tests: reorganize CLI's `convert` tests Create a `convert` directory under tests/cli, so we can have multiple separate tests targeting specific features of the convert command. Move test_convert_args in there, this is the file containing the things that are easy to test, comparing the output of --run-args with an expected output. Move the auto source discovery test in there too, as it's a feature of the convert command. Rename it to "auto source discovery grouping", since that is mostly what it exercises, and we'll want to add tests for other areas of auto source discovery. Change-Id: I20e5085d6b41eec322b777f45be1fee87894fe91 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/1808 Reviewed-by: Philippe Proulx Tested-by: jenkins --- tests/Makefile.am | 8 ++++---- .../test_auto_source_discovery_grouping} | 2 +- tests/cli/{ => convert}/test_convert_args | 0 .../auto-source-discovery-grouping}/bt_plugin_test.py | 0 .../auto-source-discovery-grouping}/traces/aaa1 | 0 .../auto-source-discovery-grouping}/traces/aaa2 | 0 .../auto-source-discovery-grouping}/traces/aaa3 | 0 .../auto-source-discovery-grouping}/traces/bbb1 | 0 .../auto-source-discovery-grouping}/traces/bbb2 | 0 .../auto-source-discovery-grouping}/traces/ccc1 | 0 .../auto-source-discovery-grouping}/traces/ccc2 | 0 .../auto-source-discovery-grouping}/traces/ccc3 | 0 .../auto-source-discovery-grouping}/traces/ccc4 | 0 .../auto-source-discovery-grouping}/traces/some-dir/aaa10 | 0 14 files changed, 5 insertions(+), 5 deletions(-) rename tests/cli/{auto-source-discovery/test_auto_source_discovery => convert/test_auto_source_discovery_grouping} (96%) rename tests/cli/{ => convert}/test_convert_args (100%) rename tests/data/cli/{auto-source-discovery => convert/auto-source-discovery-grouping}/bt_plugin_test.py (100%) rename tests/data/cli/{auto-source-discovery => convert/auto-source-discovery-grouping}/traces/aaa1 (100%) rename tests/data/cli/{auto-source-discovery => convert/auto-source-discovery-grouping}/traces/aaa2 (100%) rename tests/data/cli/{auto-source-discovery => convert/auto-source-discovery-grouping}/traces/aaa3 (100%) rename tests/data/cli/{auto-source-discovery => convert/auto-source-discovery-grouping}/traces/bbb1 (100%) rename tests/data/cli/{auto-source-discovery => convert/auto-source-discovery-grouping}/traces/bbb2 (100%) rename tests/data/cli/{auto-source-discovery => convert/auto-source-discovery-grouping}/traces/ccc1 (100%) rename tests/data/cli/{auto-source-discovery => convert/auto-source-discovery-grouping}/traces/ccc2 (100%) rename tests/data/cli/{auto-source-discovery => convert/auto-source-discovery-grouping}/traces/ccc3 (100%) rename tests/data/cli/{auto-source-discovery => convert/auto-source-discovery-grouping}/traces/ccc4 (100%) rename tests/data/cli/{auto-source-discovery => convert/auto-source-discovery-grouping}/traces/some-dir/aaa10 (100%) diff --git a/tests/Makefile.am b/tests/Makefile.am index 845b9c44..5b641c8d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -31,8 +31,8 @@ dist_check_SCRIPTS = \ bindings/python/bt2/test_trace.py \ bindings/python/bt2/test_value.py \ bindings/python/bt2/utils.py \ - cli/auto-source-discovery/test_auto_source_discovery \ - cli/test_convert_args \ + cli/convert/test_auto_source_discovery_grouping \ + cli/convert/test_convert_args \ cli/test_intersection \ cli/test_output_ctf_metadata \ cli/test_packet_seq_num \ @@ -53,9 +53,9 @@ TESTS_ARGPAR = \ argpar/test_argpar TESTS_CLI = \ + cli/convert/test_convert_args \ cli/test_trace_read \ cli/test_packet_seq_num \ - cli/test_convert_args \ cli/test_intersection \ cli/test_trace_copy \ cli/test_trimmer @@ -105,7 +105,7 @@ endif if ENABLE_PYTHON_PLUGINS if ENABLE_PYTHON_BINDINGS -TESTS_CLI += cli/auto-source-discovery/test_auto_source_discovery +TESTS_CLI += cli/convert/test_auto_source_discovery_grouping TESTS_PLUGINS += plugins/flt.utils.trimmer/test_trimming endif endif diff --git a/tests/cli/auto-source-discovery/test_auto_source_discovery b/tests/cli/convert/test_auto_source_discovery_grouping similarity index 96% rename from tests/cli/auto-source-discovery/test_auto_source_discovery rename to tests/cli/convert/test_auto_source_discovery_grouping index 470df17e..60128d3e 100755 --- a/tests/cli/auto-source-discovery/test_auto_source_discovery +++ b/tests/cli/convert/test_auto_source_discovery_grouping @@ -30,7 +30,7 @@ NUM_TESTS=1 plan_tests $NUM_TESTS -data_dir="${BT_TESTS_DATADIR}/cli/auto-source-discovery" +data_dir="${BT_TESTS_DATADIR}/cli/convert/auto-source-discovery-grouping" plugin_dir="${data_dir}" trace_dir="${data_dir}/traces" diff --git a/tests/cli/test_convert_args b/tests/cli/convert/test_convert_args similarity index 100% rename from tests/cli/test_convert_args rename to tests/cli/convert/test_convert_args diff --git a/tests/data/cli/auto-source-discovery/bt_plugin_test.py b/tests/data/cli/convert/auto-source-discovery-grouping/bt_plugin_test.py similarity index 100% rename from tests/data/cli/auto-source-discovery/bt_plugin_test.py rename to tests/data/cli/convert/auto-source-discovery-grouping/bt_plugin_test.py diff --git a/tests/data/cli/auto-source-discovery/traces/aaa1 b/tests/data/cli/convert/auto-source-discovery-grouping/traces/aaa1 similarity index 100% rename from tests/data/cli/auto-source-discovery/traces/aaa1 rename to tests/data/cli/convert/auto-source-discovery-grouping/traces/aaa1 diff --git a/tests/data/cli/auto-source-discovery/traces/aaa2 b/tests/data/cli/convert/auto-source-discovery-grouping/traces/aaa2 similarity index 100% rename from tests/data/cli/auto-source-discovery/traces/aaa2 rename to tests/data/cli/convert/auto-source-discovery-grouping/traces/aaa2 diff --git a/tests/data/cli/auto-source-discovery/traces/aaa3 b/tests/data/cli/convert/auto-source-discovery-grouping/traces/aaa3 similarity index 100% rename from tests/data/cli/auto-source-discovery/traces/aaa3 rename to tests/data/cli/convert/auto-source-discovery-grouping/traces/aaa3 diff --git a/tests/data/cli/auto-source-discovery/traces/bbb1 b/tests/data/cli/convert/auto-source-discovery-grouping/traces/bbb1 similarity index 100% rename from tests/data/cli/auto-source-discovery/traces/bbb1 rename to tests/data/cli/convert/auto-source-discovery-grouping/traces/bbb1 diff --git a/tests/data/cli/auto-source-discovery/traces/bbb2 b/tests/data/cli/convert/auto-source-discovery-grouping/traces/bbb2 similarity index 100% rename from tests/data/cli/auto-source-discovery/traces/bbb2 rename to tests/data/cli/convert/auto-source-discovery-grouping/traces/bbb2 diff --git a/tests/data/cli/auto-source-discovery/traces/ccc1 b/tests/data/cli/convert/auto-source-discovery-grouping/traces/ccc1 similarity index 100% rename from tests/data/cli/auto-source-discovery/traces/ccc1 rename to tests/data/cli/convert/auto-source-discovery-grouping/traces/ccc1 diff --git a/tests/data/cli/auto-source-discovery/traces/ccc2 b/tests/data/cli/convert/auto-source-discovery-grouping/traces/ccc2 similarity index 100% rename from tests/data/cli/auto-source-discovery/traces/ccc2 rename to tests/data/cli/convert/auto-source-discovery-grouping/traces/ccc2 diff --git a/tests/data/cli/auto-source-discovery/traces/ccc3 b/tests/data/cli/convert/auto-source-discovery-grouping/traces/ccc3 similarity index 100% rename from tests/data/cli/auto-source-discovery/traces/ccc3 rename to tests/data/cli/convert/auto-source-discovery-grouping/traces/ccc3 diff --git a/tests/data/cli/auto-source-discovery/traces/ccc4 b/tests/data/cli/convert/auto-source-discovery-grouping/traces/ccc4 similarity index 100% rename from tests/data/cli/auto-source-discovery/traces/ccc4 rename to tests/data/cli/convert/auto-source-discovery-grouping/traces/ccc4 diff --git a/tests/data/cli/auto-source-discovery/traces/some-dir/aaa10 b/tests/data/cli/convert/auto-source-discovery-grouping/traces/some-dir/aaa10 similarity index 100% rename from tests/data/cli/auto-source-discovery/traces/some-dir/aaa10 rename to tests/data/cli/convert/auto-source-discovery-grouping/traces/some-dir/aaa10 -- 2.34.1