diff --git a/tests/tasks.yaml b/tests/tasks.yaml index 8d0fbc3..357ec0d 100644 --- a/tests/tasks.yaml +++ b/tests/tasks.yaml @@ -204,6 +204,36 @@ tasks: short_desc: Check overridden task, 2 deep commands: - echo main config file + base_cmds_inherit: + commands: + - echo base + 043a_cmds_override: + base: base_cmds_inherit + short_desc: Check commands override + commands: + - echo derived + 043b_cmds_inherit_before: + base: base_cmds_inherit + base_cmds: before + short_desc: Check commands before + commands: + - echo derived + 043c_cmds_inherit_after: + base: base_cmds_inherit + base_cmds: after + short_desc: Check commands after + commands: + - echo derived + 043d_cmds_inherit_ignore: + base: base_cmds_inherit + base_cmds: ignore + short_desc: Check forced ignore of commands + 043e_cmds_inherit_depth_2: + base: 043b_cmds_inherit_before + base_cmds: before + commands: + - echo derived2 + short_desc: Check forced ignore of commands base_container_test: short_desc: Basic container support commands: diff --git a/tests/xeet.expected/043a_cmds_override/stderr b/tests/xeet.expected/043a_cmds_override/stderr new file mode 100644 index 0000000..e69de29 diff --git a/tests/xeet.expected/043a_cmds_override/stdout b/tests/xeet.expected/043a_cmds_override/stdout new file mode 100644 index 0000000..cd2732a --- /dev/null +++ b/tests/xeet.expected/043a_cmds_override/stdout @@ -0,0 +1 @@ +derived diff --git a/tests/xeet.expected/043b_cmds_inherit_before/stderr b/tests/xeet.expected/043b_cmds_inherit_before/stderr new file mode 100644 index 0000000..e69de29 diff --git a/tests/xeet.expected/043b_cmds_inherit_before/stdout b/tests/xeet.expected/043b_cmds_inherit_before/stdout new file mode 100644 index 0000000..82f310a --- /dev/null +++ b/tests/xeet.expected/043b_cmds_inherit_before/stdout @@ -0,0 +1,2 @@ +base +derived diff --git a/tests/xeet.expected/043c_cmds_inherit_after/stderr b/tests/xeet.expected/043c_cmds_inherit_after/stderr new file mode 100644 index 0000000..e69de29 diff --git a/tests/xeet.expected/043c_cmds_inherit_after/stdout b/tests/xeet.expected/043c_cmds_inherit_after/stdout new file mode 100644 index 0000000..317663b --- /dev/null +++ b/tests/xeet.expected/043c_cmds_inherit_after/stdout @@ -0,0 +1,2 @@ +derived +base diff --git a/tests/xeet.expected/043d_cmds_inherit_ignore/stderr b/tests/xeet.expected/043d_cmds_inherit_ignore/stderr new file mode 100644 index 0000000..e69de29 diff --git a/tests/xeet.expected/043d_cmds_inherit_ignore/stdout b/tests/xeet.expected/043d_cmds_inherit_ignore/stdout new file mode 100644 index 0000000..5a8ac5d --- /dev/null +++ b/tests/xeet.expected/043d_cmds_inherit_ignore/stdout @@ -0,0 +1 @@ +No commands defined for task '043d_cmds_inherit_ignore'. Nothing to do. diff --git a/tests/xeet.expected/043e_cmds_inherit_depth_2/stderr b/tests/xeet.expected/043e_cmds_inherit_depth_2/stderr new file mode 100644 index 0000000..e69de29 diff --git a/tests/xeet.expected/043e_cmds_inherit_depth_2/stdout b/tests/xeet.expected/043e_cmds_inherit_depth_2/stdout new file mode 100644 index 0000000..c6086f5 --- /dev/null +++ b/tests/xeet.expected/043e_cmds_inherit_depth_2/stdout @@ -0,0 +1,3 @@ +base +derived +derived2 diff --git a/tests/xeet.json b/tests/xeet.json index de23bd6..53dc942 100644 --- a/tests/xeet.json +++ b/tests/xeet.json @@ -134,6 +134,31 @@ "name": "042_included", "base": "test_base" } + ,{ + "name": "043a_cmds_override", + "base": "test_base", + "groups": ["cmds_inherit"] + } + ,{ + "name": "043b_cmds_inherit_before", + "base": "test_base", + "groups": ["cmds_inherit"] + } + ,{ + "name": "043c_cmds_inherit_after", + "base": "test_base", + "groups": ["cmds_inherit"] + } + ,{ + "name": "043d_cmds_inherit_ignore", + "base": "test_base", + "groups": ["cmds_inherit"] + } + ,{ + "name": "043e_cmds_inherit_depth_2", + "base": "test_base", + "groups": ["cmds_inherit"] + } ,{ "name": "050a_container_ubuntu", "base": "test_base",