Simplify current tests

This patch:

* Adds the global yaml_cfg_path() fixture which returns the path to an
  hypothetical barectf YAML configuration file based on the test's
  module file and function names.

* Updates the config_fail_test() fixture to only use yaml_cfg_path()

* Updates all the test functions to only use config_fail_test() and call
  it without parameters.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/tests/config/yaml/2/test_fail_clock.py b/tests/config/yaml/2/test_fail_clock.py
index b132687b2ead442953a6615d8ad7cc80eb8c10dd..a83d2a28dce04826d82926aa63bc274877168e0e 100644 (file)
--- a/tests/config/yaml/2/test_fail_clock.py
+++ b/tests/config/yaml/2/test_fail_clock.py
@@ -21,69 +21,69 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-def test_absolute_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'clock/absolute-invalid-type')
+def test_absolute_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_description_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'clock/description-invalid-type')
+def test_description_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_ec_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'clock/ec-invalid-type')
+def test_ec_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_ec_invalid(request, config_fail_test):
-    config_fail_test(request, 'clock/ec-invalid')
+def test_ec_invalid(config_fail_test):
+    config_fail_test()
 
 
-def test_freq_0(request, config_fail_test):
-    config_fail_test(request, 'clock/freq-0')
+def test_freq_0(config_fail_test):
+    config_fail_test()
 
 
-def test_freq_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'clock/freq-invalid-type')
+def test_freq_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_freq_neg(request, config_fail_test):
-    config_fail_test(request, 'clock/freq-neg')
+def test_freq_neg(config_fail_test):
+    config_fail_test()
 
 
-def test_offset_cycles_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'clock/offset-cycles-invalid-type')
+def test_offset_cycles_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_offset_cycles_neg(request, config_fail_test):
-    config_fail_test(request, 'clock/offset-cycles-neg')
+def test_offset_cycles_neg(config_fail_test):
+    config_fail_test()
 
 
-def test_offset_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'clock/offset-invalid-type')
+def test_offset_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_offset_seconds_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'clock/offset-seconds-invalid-type')
+def test_offset_seconds_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_offset_seconds_neg(request, config_fail_test):
-    config_fail_test(request, 'clock/offset-seconds-neg')
+def test_offset_seconds_neg(config_fail_test):
+    config_fail_test()
 
 
-def test_offset_unknown_prop(request, config_fail_test):
-    config_fail_test(request, 'clock/offset-unknown-prop')
+def test_offset_unknown_prop(config_fail_test):
+    config_fail_test()
 
 
-def test_rct_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'clock/rct-invalid-type')
+def test_rct_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_unknown_prop(request, config_fail_test):
-    config_fail_test(request, 'clock/unknown-prop')
+def test_unknown_prop(config_fail_test):
+    config_fail_test()
 
 
-def test_uuid_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'clock/uuid-invalid-type')
+def test_uuid_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_uuid_invalid(request, config_fail_test):
-    config_fail_test(request, 'clock/uuid-invalid')
+def test_uuid_invalid(config_fail_test):
+    config_fail_test()

diff --git a/tests/config/yaml/2/test_fail_config.py b/tests/config/yaml/2/test_fail_config.py
index 1dd31663764fd86186110ec420464e5062f4dfb2..99f27c78d7a35a1a6af4d0632611da723053730d 100644 (file)
--- a/tests/config/yaml/2/test_fail_config.py
+++ b/tests/config/yaml/2/test_fail_config.py
@@ -21,53 +21,53 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-def test_metadata_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'config/metadata-invalid-type')
+def test_metadata_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_metadata_no(request, config_fail_test):
-    config_fail_test(request, 'config/metadata-no')
+def test_metadata_no(config_fail_test):
+    config_fail_test()
 
 
-def test_options_gen_default_stream_def_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'config/options-gen-default-stream-def-invalid-type')
+def test_options_gen_default_stream_def_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_options_gen_prefix_def_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'config/options-gen-prefix-def-invalid-type')
+def test_options_gen_prefix_def_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_options_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'config/options-invalid-type')
+def test_options_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_options_unknown_prop(request, config_fail_test):
-    config_fail_test(request, 'config/options-unknown-prop')
+def test_options_unknown_prop(config_fail_test):
+    config_fail_test()
 
 
-def test_prefix_invalid_identifier(request, config_fail_test):
-    config_fail_test(request, 'config/prefix-invalid-identifier')
+def test_prefix_invalid_identifier(config_fail_test):
+    config_fail_test()
 
 
-def test_prefix_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'config/prefix-invalid-type')
+def test_prefix_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_unknown_prop(request, config_fail_test):
-    config_fail_test(request, 'config/unknown-prop')
+def test_unknown_prop(config_fail_test):
+    config_fail_test()
 
 
-def test_version_invalid_19(request, config_fail_test):
-    config_fail_test(request, 'config/version-invalid-19')
+def test_version_invalid_19(config_fail_test):
+    config_fail_test()
 
 
-def test_version_invalid_23(request, config_fail_test):
-    config_fail_test(request, 'config/version-invalid-23')
+def test_version_invalid_23(config_fail_test):
+    config_fail_test()
 
 
-def test_version_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'config/version-invalid-type')
+def test_version_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_version_no(request, config_fail_test):
-    config_fail_test(request, 'config/version-no')
+def test_version_no(config_fail_test):
+    config_fail_test()

diff --git a/tests/config/yaml/2/test_fail_event.py b/tests/config/yaml/2/test_fail_event.py
index a89b8c9d7eccbe4e1da99308b6c7145969e9ceb0..6d4c0a20832482b65183640958201136e6de42b0 100644 (file)
--- a/tests/config/yaml/2/test_fail_event.py
+++ b/tests/config/yaml/2/test_fail_event.py
@@ -21,33 +21,33 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-def test_ct_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'event/ct-invalid-type')
+def test_ct_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_ct_not_struct(request, config_fail_test):
-    config_fail_test(request, 'event/ct-not-struct')
+def test_ct_not_struct(config_fail_test):
+    config_fail_test()
 
 
-def test_ll_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'event/ll-invalid-type')
+def test_ll_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_ll_non_existing(request, config_fail_test):
-    config_fail_test(request, 'event/ll-non-existing')
+def test_ll_non_existing(config_fail_test):
+    config_fail_test()
 
 
-def test_no_fields_at_all(request, config_fail_test):
-    config_fail_test(request, 'event/no-fields-at-all')
+def test_no_fields_at_all(config_fail_test):
+    config_fail_test()
 
 
-def test_pt_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'event/pt-invalid-type')
+def test_pt_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_pt_not_struct(request, config_fail_test):
-    config_fail_test(request, 'event/pt-not-struct')
+def test_pt_not_struct(config_fail_test):
+    config_fail_test()
 
 
-def test_unknown_prop(request, config_fail_test):
-    config_fail_test(request, 'event/unknown-prop')
+def test_unknown_prop(config_fail_test):
+    config_fail_test()

diff --git a/tests/config/yaml/2/test_fail_include.py b/tests/config/yaml/2/test_fail_include.py
index 7f549982020f67772ec3db1f99b5307964f44d22..1e70ec710f916387d738a35aa400016e0b39f082 100644 (file)
--- a/tests/config/yaml/2/test_fail_include.py
+++ b/tests/config/yaml/2/test_fail_include.py
@@ -21,25 +21,25 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-def test_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'include/invalid-type')
+def test_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_file_not_found(request, config_fail_test):
-    config_fail_test(request, 'include/file-not-found')
+def test_file_not_found(config_fail_test):
+    config_fail_test()
 
 
-def test_file_not_found_abs(request, config_fail_test):
-    config_fail_test(request, 'include/file-not-found-abs')
+def test_file_not_found_abs(config_fail_test):
+    config_fail_test()
 
 
-def test_file_not_found_in_array(request, config_fail_test):
-    config_fail_test(request, 'include/file-not-found-in-array')
+def test_file_not_found_in_array(config_fail_test):
+    config_fail_test()
 
 
-def test_file_not_found_recursive(request, config_fail_test):
-    config_fail_test(request, 'include/file-not-found-recursive')
+def test_file_not_found_recursive(config_fail_test):
+    config_fail_test()
 
 
-def test_cycle(request, config_fail_test):
-    config_fail_test(request, 'include/cycle')
+def test_cycle(config_fail_test):
+    config_fail_test()

diff --git a/tests/config/yaml/2/test_fail_metadata.py b/tests/config/yaml/2/test_fail_metadata.py
index ba11f479deaab6758180226bc498e5cac7f8aad1..c131cb945a6e06a2034b00d613366ee078985132 100644 (file)
--- a/tests/config/yaml/2/test_fail_metadata.py
+++ b/tests/config/yaml/2/test_fail_metadata.py
@@ -21,81 +21,81 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-def test_clocks_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'metadata/clocks-invalid-type')
+def test_clocks_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_clocks_key_invalid_identifier(request, config_fail_test):
-    config_fail_test(request, 'metadata/clocks-key-invalid-identifier')
+def test_clocks_key_invalid_identifier(config_fail_test):
+    config_fail_test()
 
 
-def test_default_stream_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'metadata/default-stream-invalid-type')
+def test_default_stream_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_default_stream_stream_default_duplicate(request, config_fail_test):
-    config_fail_test(request, 'metadata/default-stream-stream-default-duplicate')
+def test_default_stream_stream_default_duplicate(config_fail_test):
+    config_fail_test()
 
 
-def test_default_stream_unknown_stream(request, config_fail_test):
-    config_fail_test(request, 'metadata/default-stream-unknown-stream')
+def test_default_stream_unknown_stream(config_fail_test):
+    config_fail_test()
 
 
-def test_env_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'metadata/env-invalid-type')
+def test_env_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_env_key_invalid_identifier(request, config_fail_test):
-    config_fail_test(request, 'metadata/env-key-invalid-identifier')
+def test_env_key_invalid_identifier(config_fail_test):
+    config_fail_test()
 
 
-def test_env_value_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'metadata/env-value-invalid-type')
+def test_env_value_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_ll_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'metadata/ll-invalid-type')
+def test_ll_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_ll_value_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'metadata/ll-value-invalid-type')
+def test_ll_value_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_multiple_streams_trace_ph_no_stream_id(request, config_fail_test):
-    config_fail_test(request, 'metadata/multiple-streams-trace-ph-no-stream-id')
+def test_multiple_streams_trace_ph_no_stream_id(config_fail_test):
+    config_fail_test()
 
 
-def test_streams_empty(request, config_fail_test):
-    config_fail_test(request, 'metadata/streams-empty')
+def test_streams_empty(config_fail_test):
+    config_fail_test()
 
 
-def test_streams_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'metadata/streams-invalid-type')
+def test_streams_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_streams_key_invalid_identifier(request, config_fail_test):
-    config_fail_test(request, 'metadata/streams-key-invalid-identifier')
+def test_streams_key_invalid_identifier(config_fail_test):
+    config_fail_test()
 
 
-def test_streams_no(request, config_fail_test):
-    config_fail_test(request, 'metadata/streams-no')
+def test_streams_no(config_fail_test):
+    config_fail_test()
 
 
-def test_ta_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'metadata/ta-invalid-type')
+def test_ta_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_trace_empty(request, config_fail_test):
-    config_fail_test(request, 'metadata/trace-empty')
+def test_trace_empty(config_fail_test):
+    config_fail_test()
 
 
-def test_trace_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'metadata/trace-invalid-type')
+def test_trace_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_trace_no(request, config_fail_test):
-    config_fail_test(request, 'metadata/trace-no')
+def test_trace_no(config_fail_test):
+    config_fail_test()
 
 
-def test_unknown_prop(request, config_fail_test):
-    config_fail_test(request, 'metadata/unknown-prop')
+def test_unknown_prop(config_fail_test):
+    config_fail_test()

diff --git a/tests/config/yaml/2/test_fail_stream.py b/tests/config/yaml/2/test_fail_stream.py
index 42a9a5b14d373c51f779919351460e8a195b3aab..3b640da45a8f8966e7960650c464424b53c179ae 100644 (file)
--- a/tests/config/yaml/2/test_fail_stream.py
+++ b/tests/config/yaml/2/test_fail_stream.py
@@ -21,149 +21,149 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-def test_default_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'stream/default-invalid-type')
+def test_default_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_ect_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'stream/ect-invalid-type')
+def test_ect_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_ect_not_struct(request, config_fail_test):
-    config_fail_test(request, 'stream/ect-not-struct')
+def test_ect_not_struct(config_fail_test):
+    config_fail_test()
 
 
-def test_eht_id_no_multiple_events(request, config_fail_test):
-    config_fail_test(request, 'stream/eht-id-no-multiple-events')
+def test_eht_id_no_multiple_events(config_fail_test):
+    config_fail_test()
 
 
-def test_eht_id_not_int(request, config_fail_test):
-    config_fail_test(request, 'stream/eht-id-not-int')
+def test_eht_id_not_int(config_fail_test):
+    config_fail_test()
 
 
-def test_eht_id_too_small(request, config_fail_test):
-    config_fail_test(request, 'stream/eht-id-too-small')
+def test_eht_id_too_small(config_fail_test):
+    config_fail_test()
 
 
-def test_eht_id_wrong_signed(request, config_fail_test):
-    config_fail_test(request, 'stream/eht-id-wrong-signed')
+def test_eht_id_wrong_signed(config_fail_test):
+    config_fail_test()
 
 
-def test_eht_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'stream/eht-invalid-type')
+def test_eht_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_eht_not_struct(request, config_fail_test):
-    config_fail_test(request, 'stream/eht-not-struct')
+def test_eht_not_struct(config_fail_test):
+    config_fail_test()
 
 
-def test_eht_timestamp_not_int(request, config_fail_test):
-    config_fail_test(request, 'stream/eht-timestamp-not-int')
+def test_eht_timestamp_not_int(config_fail_test):
+    config_fail_test()
 
 
-def test_eht_timestamp_wrong_pm(request, config_fail_test):
-    config_fail_test(request, 'stream/eht-timestamp-wrong-pm')
+def test_eht_timestamp_wrong_pm(config_fail_test):
+    config_fail_test()
 
 
-def test_eht_timestamp_wrong_signed(request, config_fail_test):
-    config_fail_test(request, 'stream/eht-timestamp-wrong-signed')
+def test_eht_timestamp_wrong_signed(config_fail_test):
+    config_fail_test()
 
 
-def test_events_empty(request, config_fail_test):
-    config_fail_test(request, 'stream/events-empty')
+def test_events_empty(config_fail_test):
+    config_fail_test()
 
 
-def test_events_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'stream/events-invalid-type')
+def test_events_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_events_key_invalid_identifier(request, config_fail_test):
-    config_fail_test(request, 'stream/events-key-invalid-identifier')
+def test_events_key_invalid_identifier(config_fail_test):
+    config_fail_test()
 
 
-def test_events_no(request, config_fail_test):
-    config_fail_test(request, 'stream/events-no')
+def test_events_no(config_fail_test):
+    config_fail_test()
 
 
-def test_pct_cs_not_int(request, config_fail_test):
-    config_fail_test(request, 'stream/pct-cs-not-int')
+def test_pct_cs_not_int(config_fail_test):
+    config_fail_test()
 
 
-def test_pct_cs_wrong_signed(request, config_fail_test):
-    config_fail_test(request, 'stream/pct-cs-wrong-signed')
+def test_pct_cs_wrong_signed(config_fail_test):
+    config_fail_test()
 
 
-def test_pct_cs_yes_ps_no(request, config_fail_test):
-    config_fail_test(request, 'stream/pct-cs-yes-ps-no')
+def test_pct_cs_yes_ps_no(config_fail_test):
+    config_fail_test()
 
 
-def test_pct_ed_not_int(request, config_fail_test):
-    config_fail_test(request, 'stream/pct-ed-not-int')
+def test_pct_ed_not_int(config_fail_test):
+    config_fail_test()
 
 
-def test_pct_ed_wrong_signed(request, config_fail_test):
-    config_fail_test(request, 'stream/pct-ed-wrong-signed')
+def test_pct_ed_wrong_signed(config_fail_test):
+    config_fail_test()
 
 
-def test_pct_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'stream/pct-invalid-type')
+def test_pct_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_pct_not_struct(request, config_fail_test):
-    config_fail_test(request, 'stream/pct-not-struct')
+def test_pct_not_struct(config_fail_test):
+    config_fail_test()
 
 
-def test_pct_no(request, config_fail_test):
-    config_fail_test(request, 'stream/pct-no')
+def test_pct_no(config_fail_test):
+    config_fail_test()
 
 
-def test_pct_ps_not_int(request, config_fail_test):
-    config_fail_test(request, 'stream/pct-ps-not-int')
+def test_pct_ps_not_int(config_fail_test):
+    config_fail_test()
 
 
-def test_pct_ps_wrong_signed(request, config_fail_test):
-    config_fail_test(request, 'stream/pct-ps-wrong-signed')
+def test_pct_ps_wrong_signed(config_fail_test):
+    config_fail_test()
 
 
-def test_pct_ps_yes_cs_no(request, config_fail_test):
-    config_fail_test(request, 'stream/pct-ps-yes-cs-no')
+def test_pct_ps_yes_cs_no(config_fail_test):
+    config_fail_test()
 
 
-def test_pct_tb_not_int(request, config_fail_test):
-    config_fail_test(request, 'stream/pct-tb-not-int')
+def test_pct_tb_not_int(config_fail_test):
+    config_fail_test()
 
 
-def test_pct_tb_te_different_clocks(request, config_fail_test):
-    config_fail_test(request, 'stream/pct-tb-te-different-clocks')
+def test_pct_tb_te_different_clocks(config_fail_test):
+    config_fail_test()
 
 
-def test_pct_tb_wrong_pm(request, config_fail_test):
-    config_fail_test(request, 'stream/pct-tb-wrong-pm')
+def test_pct_tb_wrong_pm(config_fail_test):
+    config_fail_test()
 
 
-def test_pct_tb_wrong_signed(request, config_fail_test):
-    config_fail_test(request, 'stream/pct-tb-wrong-signed')
+def test_pct_tb_wrong_signed(config_fail_test):
+    config_fail_test()
 
 
-def test_pct_tb_yes_te_no(request, config_fail_test):
-    config_fail_test(request, 'stream/pct-tb-yes-te-no')
+def test_pct_tb_yes_te_no(config_fail_test):
+    config_fail_test()
 
 
-def test_pct_te_not_int(request, config_fail_test):
-    config_fail_test(request, 'stream/pct-te-not-int')
+def test_pct_te_not_int(config_fail_test):
+    config_fail_test()
 
 
-def test_pct_te_wrong_pm(request, config_fail_test):
-    config_fail_test(request, 'stream/pct-te-wrong-pm')
+def test_pct_te_wrong_pm(config_fail_test):
+    config_fail_test()
 
 
-def test_pct_te_wrong_signed(request, config_fail_test):
-    config_fail_test(request, 'stream/pct-te-wrong-signed')
+def test_pct_te_wrong_signed(config_fail_test):
+    config_fail_test()
 
 
-def test_pct_te_yes_tb_no(request, config_fail_test):
-    config_fail_test(request, 'stream/pct-te-yes-tb-no')
+def test_pct_te_yes_tb_no(config_fail_test):
+    config_fail_test()
 
 
-def test_unknown_prop(request, config_fail_test):
-    config_fail_test(request, 'stream/unknown-prop')
+def test_unknown_prop(config_fail_test):
+    config_fail_test()

diff --git a/tests/config/yaml/2/test_fail_trace.py b/tests/config/yaml/2/test_fail_trace.py
index 82cae71d4ada69b29f8c0b835c2fb0b1aebb4c88..951c4f84633a19f25cf55baa27a0446ca4096c47 100644 (file)
--- a/tests/config/yaml/2/test_fail_trace.py
+++ b/tests/config/yaml/2/test_fail_trace.py
@@ -21,77 +21,77 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-def test_bo_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'trace/bo-invalid-type')
+def test_bo_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_bo_invalid(request, config_fail_test):
-    config_fail_test(request, 'trace/bo-invalid')
+def test_bo_invalid(config_fail_test):
+    config_fail_test()
 
 
-def test_bo_no(request, config_fail_test):
-    config_fail_test(request, 'trace/bo-no')
+def test_bo_no(config_fail_test):
+    config_fail_test()
 
 
-def test_ph_magic_not_int(request, config_fail_test):
-    config_fail_test(request, 'trace/ph-magic-not-int')
+def test_ph_magic_not_int(config_fail_test):
+    config_fail_test()
 
 
-def test_ph_magic_wrong_signed(request, config_fail_test):
-    config_fail_test(request, 'trace/ph-magic-wrong-signed')
+def test_ph_magic_wrong_signed(config_fail_test):
+    config_fail_test()
 
 
-def test_ph_magic_wrong_size(request, config_fail_test):
-    config_fail_test(request, 'trace/ph-magic-wrong-size')
+def test_ph_magic_wrong_size(config_fail_test):
+    config_fail_test()
 
 
-def test_ph_not_struct(request, config_fail_test):
-    config_fail_test(request, 'trace/ph-not-struct')
+def test_ph_not_struct(config_fail_test):
+    config_fail_test()
 
 
-def test_ph_streamid_not_int(request, config_fail_test):
-    config_fail_test(request, 'trace/ph-streamid-not-int')
+def test_ph_streamid_not_int(config_fail_test):
+    config_fail_test()
 
 
-def test_ph_streamid_too_small(request, config_fail_test):
-    config_fail_test(request, 'trace/ph-streamid-too-small')
+def test_ph_streamid_too_small(config_fail_test):
+    config_fail_test()
 
 
-def test_ph_streamid_wrong_signed(request, config_fail_test):
-    config_fail_test(request, 'trace/ph-streamid-wrong-signed')
+def test_ph_streamid_wrong_signed(config_fail_test):
+    config_fail_test()
 
 
-def test_ph_uuid_et_not_int(request, config_fail_test):
-    config_fail_test(request, 'trace/ph-uuid-et-not-int')
+def test_ph_uuid_et_not_int(config_fail_test):
+    config_fail_test()
 
 
-def test_ph_uuid_et_wrong_align(request, config_fail_test):
-    config_fail_test(request, 'trace/ph-uuid-et-wrong-align')
+def test_ph_uuid_et_wrong_align(config_fail_test):
+    config_fail_test()
 
 
-def test_ph_uuid_et_wrong_signed(request, config_fail_test):
-    config_fail_test(request, 'trace/ph-uuid-et-wrong-signed')
+def test_ph_uuid_et_wrong_signed(config_fail_test):
+    config_fail_test()
 
 
-def test_ph_uuid_et_wrong_size(request, config_fail_test):
-    config_fail_test(request, 'trace/ph-uuid-et-wrong-size')
+def test_ph_uuid_et_wrong_size(config_fail_test):
+    config_fail_test()
 
 
-def test_ph_uuid_not_array(request, config_fail_test):
-    config_fail_test(request, 'trace/ph-uuid-not-array')
+def test_ph_uuid_not_array(config_fail_test):
+    config_fail_test()
 
 
-def test_ph_uuid_wrong_length(request, config_fail_test):
-    config_fail_test(request, 'trace/ph-uuid-wrong-length')
+def test_ph_uuid_wrong_length(config_fail_test):
+    config_fail_test()
 
 
-def test_unknown_prop(request, config_fail_test):
-    config_fail_test(request, 'trace/unknown-prop')
+def test_unknown_prop(config_fail_test):
+    config_fail_test()
 
 
-def test_uuid_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'trace/uuid-invalid-type')
+def test_uuid_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_uuid_invalid_uuid(request, config_fail_test):
-    config_fail_test(request, 'trace/uuid-invalid-uuid')
+def test_uuid_invalid_uuid(config_fail_test):
+    config_fail_test()

diff --git a/tests/config/yaml/2/test_fail_type.py b/tests/config/yaml/2/test_fail_type.py
index cda672fdef18c537ea7caaf1c5d601fcf71cf64f..4b9cc32b1d95820d943a00ff1265724746b73cb2 100644 (file)
--- a/tests/config/yaml/2/test_fail_type.py
+++ b/tests/config/yaml/2/test_fail_type.py
@@ -21,17 +21,17 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-def test_inherit_forward(request, config_fail_test):
-    config_fail_test(request, 'type/inherit-forward')
+def test_inherit_forward(config_fail_test):
+    config_fail_test()
 
 
-def test_inherit_unknown(request, config_fail_test):
-    config_fail_test(request, 'type/inherit-unknown')
+def test_inherit_unknown(config_fail_test):
+    config_fail_test()
 
 
-def test_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'type/invalid-type')
+def test_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_no_class(request, config_fail_test):
-    config_fail_test(request, 'type/no-class')
+def test_no_class(config_fail_test):
+    config_fail_test()

diff --git a/tests/config/yaml/2/test_fail_type_enum.py b/tests/config/yaml/2/test_fail_type_enum.py
index ab97aaa44e17689394d5035a874c799892e5e982..6911de6abb5a26ca62e4580afa5a5b54c4b7a18d 100644 (file)
--- a/tests/config/yaml/2/test_fail_type_enum.py
+++ b/tests/config/yaml/2/test_fail_type_enum.py
@@ -21,53 +21,53 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-def test_members_el_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'type-enum/members-el-invalid-type')
+def test_members_el_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_members_el_member_label_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'type-enum/members-el-member-label-invalid-type')
+def test_members_el_member_label_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_members_el_member_unknown_prop(request, config_fail_test):
-    config_fail_test(request, 'type-enum/members-el-member-unknown-prop')
+def test_members_el_member_unknown_prop(config_fail_test):
+    config_fail_test()
 
 
-def test_members_el_member_value_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'type-enum/members-el-member-value-invalid-type')
+def test_members_el_member_value_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_members_el_member_value_outside_range_signed(request, config_fail_test):
-    config_fail_test(request, 'type-enum/members-el-member-value-outside-range-signed')
+def test_members_el_member_value_outside_range_signed(config_fail_test):
+    config_fail_test()
 
 
-def test_members_el_member_value_outside_range_unsigned(request, config_fail_test):
-    config_fail_test(request, 'type-enum/members-el-member-value-outside-range-unsigned')
+def test_members_el_member_value_outside_range_unsigned(config_fail_test):
+    config_fail_test()
 
 
-def test_members_empty(request, config_fail_test):
-    config_fail_test(request, 'type-enum/members-empty')
+def test_members_empty(config_fail_test):
+    config_fail_test()
 
 
-def test_members_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'type-enum/members-invalid-type')
+def test_members_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_members_no(request, config_fail_test):
-    config_fail_test(request, 'type-enum/members-no')
+def test_members_no(config_fail_test):
+    config_fail_test()
 
 
-def test_members_overlap(request, config_fail_test):
-    config_fail_test(request, 'type-enum/members-overlap')
+def test_members_overlap(config_fail_test):
+    config_fail_test()
 
 
-def test_unknown_prop(request, config_fail_test):
-    config_fail_test(request, 'type-enum/unknown-prop')
+def test_unknown_prop(config_fail_test):
+    config_fail_test()
 
 
-def test_vt_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'type-enum/vt-invalid-type')
+def test_vt_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_vt_no(request, config_fail_test):
-    config_fail_test(request, 'type-enum/vt-no')
+def test_vt_no(config_fail_test):
+    config_fail_test()

diff --git a/tests/config/yaml/2/test_fail_type_float.py b/tests/config/yaml/2/test_fail_type_float.py
index dc7894d53a1ecec349491c8ebd13cc962124e58c..915c4a4d2aad7a6d14dba1e77715dbf7555ab3b1 100644 (file)
--- a/tests/config/yaml/2/test_fail_type_float.py
+++ b/tests/config/yaml/2/test_fail_type_float.py
@@ -21,49 +21,49 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-def test_align_0(request, config_fail_test):
-    config_fail_test(request, 'type-float/align-0')
+def test_align_0(config_fail_test):
+    config_fail_test()
 
 
-def test_align_3(request, config_fail_test):
-    config_fail_test(request, 'type-float/align-3')
+def test_align_3(config_fail_test):
+    config_fail_test()
 
 
-def test_align_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'type-float/align-invalid-type')
+def test_align_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_bo_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'type-float/bo-invalid-type')
+def test_bo_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_bo_invalid(request, config_fail_test):
-    config_fail_test(request, 'type-float/bo-invalid')
+def test_bo_invalid(config_fail_test):
+    config_fail_test()
 
 
-def test_size_exp_mant_wrong_sum(request, config_fail_test):
-    config_fail_test(request, 'type-float/size-exp-mant-wrong-sum')
+def test_size_exp_mant_wrong_sum(config_fail_test):
+    config_fail_test()
 
 
-def test_size_exp_no(request, config_fail_test):
-    config_fail_test(request, 'type-float/size-exp-no')
+def test_size_exp_no(config_fail_test):
+    config_fail_test()
 
 
-def test_size_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'type-float/size-invalid-type')
+def test_size_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_size_mant_no(request, config_fail_test):
-    config_fail_test(request, 'type-float/size-mant-no')
+def test_size_mant_no(config_fail_test):
+    config_fail_test()
 
 
-def test_size_no(request, config_fail_test):
-    config_fail_test(request, 'type-float/size-no')
+def test_size_no(config_fail_test):
+    config_fail_test()
 
 
-def test_size_unknown_prop(request, config_fail_test):
-    config_fail_test(request, 'type-float/size-unknown-prop')
+def test_size_unknown_prop(config_fail_test):
+    config_fail_test()
 
 
-def test_unknown_prop(request, config_fail_test):
-    config_fail_test(request, 'type-float/unknown-prop')
+def test_unknown_prop(config_fail_test):
+    config_fail_test()

diff --git a/tests/config/yaml/2/test_fail_type_int.py b/tests/config/yaml/2/test_fail_type_int.py
index 07ac0a3a7c0e7ddcf76223058fc26bd14cbd0c51..0ade9fef148175ab5509c6796291d099fccf2ec7 100644 (file)
--- a/tests/config/yaml/2/test_fail_type_int.py
+++ b/tests/config/yaml/2/test_fail_type_int.py
@@ -21,69 +21,69 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-def test_align_0(request, config_fail_test):
-    config_fail_test(request, 'type-int/align-0')
+def test_align_0(config_fail_test):
+    config_fail_test()
 
 
-def test_align_3(request, config_fail_test):
-    config_fail_test(request, 'type-int/align-3')
+def test_align_3(config_fail_test):
+    config_fail_test()
 
 
-def test_align_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'type-int/align-invalid-type')
+def test_align_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_base_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'type-int/base-invalid-type')
+def test_base_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_base_invalid(request, config_fail_test):
-    config_fail_test(request, 'type-int/base-invalid')
+def test_base_invalid(config_fail_test):
+    config_fail_test()
 
 
-def test_bo_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'type-int/bo-invalid-type')
+def test_bo_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_bo_invalid(request, config_fail_test):
-    config_fail_test(request, 'type-int/bo-invalid')
+def test_bo_invalid(config_fail_test):
+    config_fail_test()
 
 
-def test_pm_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'type-int/pm-invalid-type')
+def test_pm_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_pm_property_invalid(request, config_fail_test):
-    config_fail_test(request, 'type-int/pm-property-invalid')
+def test_pm_property_invalid(config_fail_test):
+    config_fail_test()
 
 
-def test_pm_type_invalid(request, config_fail_test):
-    config_fail_test(request, 'type-int/pm-type-invalid')
+def test_pm_type_invalid(config_fail_test):
+    config_fail_test()
 
 
-def test_pm_unknown_clock(request, config_fail_test):
-    config_fail_test(request, 'type-int/pm-unknown-clock')
+def test_pm_unknown_clock(config_fail_test):
+    config_fail_test()
 
 
-def test_signed_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'type-int/signed-invalid-type')
+def test_signed_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_size_0(request, config_fail_test):
-    config_fail_test(request, 'type-int/size-0')
+def test_size_0(config_fail_test):
+    config_fail_test()
 
 
-def test_size_65(request, config_fail_test):
-    config_fail_test(request, 'type-int/size-65')
+def test_size_65(config_fail_test):
+    config_fail_test()
 
 
-def test_size_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'type-int/size-invalid-type')
+def test_size_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_size_no(request, config_fail_test):
-    config_fail_test(request, 'type-int/size-no')
+def test_size_no(config_fail_test):
+    config_fail_test()
 
 
-def test_unknown_prop(request, config_fail_test):
-    config_fail_test(request, 'type-int/unknown-prop')
+def test_unknown_prop(config_fail_test):
+    config_fail_test()

diff --git a/tests/config/yaml/2/test_fail_type_string.py b/tests/config/yaml/2/test_fail_type_string.py
index 224862fe866a456ad7735540ebebb1b8b1d2280c..6b18ee581bbdb0a57d1edbaff3e3461e6731465f 100644 (file)
--- a/tests/config/yaml/2/test_fail_type_string.py
+++ b/tests/config/yaml/2/test_fail_type_string.py
@@ -21,5 +21,5 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-def test_unknown_prop(request, config_fail_test):
-    config_fail_test(request, 'type-string/unknown-prop')
+def test_unknown_prop(config_fail_test):
+    config_fail_test()

diff --git a/tests/config/yaml/2/test_fail_type_struct.py b/tests/config/yaml/2/test_fail_type_struct.py
index 46ff835bef66a20383a4466dac0d15eab890dded..a958d8b09897549ca0dca9046f972a3550791bc4 100644 (file)
--- a/tests/config/yaml/2/test_fail_type_struct.py
+++ b/tests/config/yaml/2/test_fail_type_struct.py
@@ -21,25 +21,25 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-def test_fields_field_invalid_identifier(request, config_fail_test):
-    config_fail_test(request, 'type-struct/fields-field-invalid-identifier')
+def test_fields_field_invalid_identifier(config_fail_test):
+    config_fail_test()
 
 
-def test_fields_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'type-struct/fields-invalid-type')
+def test_fields_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_ma_0(request, config_fail_test):
-    config_fail_test(request, 'type-struct/ma-0')
+def test_ma_0(config_fail_test):
+    config_fail_test()
 
 
-def test_ma_3(request, config_fail_test):
-    config_fail_test(request, 'type-struct/ma-3')
+def test_ma_3(config_fail_test):
+    config_fail_test()
 
 
-def test_ma_invalid_type(request, config_fail_test):
-    config_fail_test(request, 'type-struct/ma-invalid-type')
+def test_ma_invalid_type(config_fail_test):
+    config_fail_test()
 
 
-def test_unknown_prop(request, config_fail_test):
-    config_fail_test(request, 'type-struct/unknown-prop')
+def test_unknown_prop(config_fail_test):
+    config_fail_test()

diff --git a/tests/config/yaml/2/test_fail_yaml.py b/tests/config/yaml/2/test_fail_yaml.py
index 8b2079c24a7eff7ac71ec31e0cf0ee4f1f130cae..58e52cc94304227fe5e6f99003a4df15a4b78e33 100644 (file)
--- a/tests/config/yaml/2/test_fail_yaml.py
+++ b/tests/config/yaml/2/test_fail_yaml.py
@@ -21,5 +21,5 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-def test_invalid(request, config_fail_test):
-    config_fail_test(request, 'yaml/invalid')
+def test_invalid(config_fail_test):
+    config_fail_test()

diff --git a/tests/config/yaml/conftest.py b/tests/config/yaml/conftest.py
index 1c29e8c33f8e557f14e9cb6cc6ed5aae309ef2c9..e9f9a2691701fde085abbc25433e4e43533efe5f 100644 (file)
--- a/tests/config/yaml/conftest.py
+++ b/tests/config/yaml/conftest.py
@@ -27,13 +27,11 @@ import barectf
 
 
 @pytest.fixture
-def config_fail_test():
-    def func(request, rel_path):
-        yaml_path = os.path.join(os.path.dirname(request.fspath),
-                                 'configs', 'fail', rel_path) + '.yaml'
-        yaml_dir = os.path.dirname(yaml_path)
+def config_fail_test(yaml_cfg_path):
+    def func():
+        yaml_dir = os.path.dirname(yaml_cfg_path)
 
-        with open(yaml_path) as f:
+        with open(yaml_cfg_path) as f:
             with pytest.raises(barectf._ConfigurationParseError):
                 barectf.configuration_from_file(f, inclusion_directories=[yaml_dir])
 

diff --git a/tests/conftest.py b/tests/conftest.py
new file mode 100644 (file)
index 0000000..b7b59fd
--- /dev/null
+++ b/tests/conftest.py
@@ -0,0 +1,54 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2020 Philippe Proulx <pproulx@efficios.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import pytest
+import os.path
+
+
+@pytest.fixture
+def yaml_cfg_path(request):
+    # Use the test's module and function names to automatically find the
+    # YAML file.
+    #
+    # For:
+    #
+    # Test module name:
+    #     `test_fail_hello_there.py`
+    #
+    # Test function name:
+    #     `test_how_are_you`
+    #
+    # The corresponding YAML file path is
+    # `configs/fail/hello-there/how-are-you.yaml'.
+    elems = [os.path.dirname(request.fspath), 'configs']
+    mod = request.module.__name__
+    mod = mod.replace('test_', '')
+    mod = mod.replace('_', '-')
+    parts = mod.split('-')
+    elems.append(parts[0])
+    elems.append('-'.join(parts[1:]))
+    func = request.function.__name__
+    func = func.replace('test_', '')
+    func = func.replace('_', '-')
+    elems.append(f'{func}.yaml')
+    return os.path.join(*elems)