Fix tests after execenv introduction

ihoro · Feb 25, 2024 · 31fce2e · 31fce2e
1 parent f633b9c
commit 31fce2e
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 8 deletions.
diff --git a/contrib/kyua/drivers/report_junit_test.cpp b/contrib/kyua/drivers/report_junit_test.cpp
@@ -63,6 +63,8 @@ static const char* const default_metadata =
     "allowed_architectures is empty\n"
     "allowed_platforms is empty\n"
     "description is empty\n"
+    "execenv is empty\n"
+    "execenv_jail is empty\n"
     "has_cleanup = false\n"
     "is_exclusive = false\n"
     "required_configs is empty\n"
@@ -80,6 +82,8 @@ static const char* const overriden_metadata =
     "allowed_architectures is empty\n"
     "allowed_platforms is empty\n"
     "description = Textual description\n"
+    "execenv is empty\n"
+    "execenv_jail is empty\n"
     "has_cleanup = false\n"
     "is_exclusive = false\n"
     "required_configs is empty\n"
@@ -199,6 +203,8 @@ ATF_TEST_CASE_BODY(junit_metadata__overrides)
         .add_allowed_architecture("arch1")
         .add_allowed_platform("platform1")
         .set_description("This is a test")
+	.set_execenv("jail")
+	.set_execenv_jail("vnet")
         .set_has_cleanup(true)
         .set_is_exclusive(true)
         .add_required_config("config1")
@@ -215,6 +221,8 @@ ATF_TEST_CASE_BODY(junit_metadata__overrides)
         + "allowed_architectures = arch1\n"
         + "allowed_platforms = platform1\n"
         + "description = This is a test\n"
+        + "execenv = jail\n"
+        + "execenv_jail = vnet\n"
         + "has_cleanup = true\n"
         + "is_exclusive = true\n"
         + "required_configs = config1\n"

diff --git a/contrib/kyua/integration/cmd_report_junit_test.sh b/contrib/kyua/integration/cmd_report_junit_test.sh
@@ -97,6 +97,8 @@ CONTENTS STRIPPED BY TEST
 allowed_architectures is empty
 allowed_platforms is empty
 description is empty
+execenv is empty
+execenv_jail is empty
 has_cleanup = false
 is_exclusive = false
 required_configs is empty
@@ -135,6 +137,8 @@ Test case metadata
 allowed_architectures is empty
 allowed_platforms is empty
 description is empty
+execenv is empty
+execenv_jail is empty
 has_cleanup = false
 is_exclusive = false
 required_configs is empty
@@ -211,6 +215,8 @@ CONTENTS STRIPPED BY TEST
 allowed_architectures is empty
 allowed_platforms is empty
 description is empty
+execenv is empty
+execenv_jail is empty
 has_cleanup = false
 is_exclusive = false
 required_configs is empty
@@ -249,6 +255,8 @@ Test case metadata
 allowed_architectures is empty
 allowed_platforms is empty
 description is empty
+execenv is empty
+execenv_jail is empty
 has_cleanup = false
 is_exclusive = false
 required_configs is empty

diff --git a/contrib/kyua/integration/cmd_report_test.sh b/contrib/kyua/integration/cmd_report_test.sh
@@ -251,6 +251,8 @@ Metadata:
     allowed_architectures is empty
     allowed_platforms is empty
     description is empty
+    execenv is empty
+    execenv_jail is empty
     has_cleanup = false
     is_exclusive = false
     required_configs is empty

diff --git a/contrib/kyua/model/metadata_test.cpp b/contrib/kyua/model/metadata_test.cpp
@@ -315,6 +315,8 @@ ATF_TEST_CASE_BODY(to_properties)
     props["allowed_platforms"] = "";
     props["custom.foo"] = "bar";
     props["description"] = "";
+    props["execenv"] = "";
+    props["execenv_jail"] = "";
     props["has_cleanup"] = "false";
     props["is_exclusive"] = "false";
     props["required_configs"] = "";
@@ -406,7 +408,8 @@ ATF_TEST_CASE_BODY(output__defaults)
     std::ostringstream str;
     str << model::metadata_builder().build();
     ATF_REQUIRE_EQ("metadata{allowed_architectures='', allowed_platforms='', "
-                   "description='', has_cleanup='false', is_exclusive='false', "
+                   "description='', execenv='', execenv_jail='', "
+                   "has_cleanup='false', is_exclusive='false', "
                    "required_configs='', "
                    "required_disk_space='0', required_files='', "
                    "required_memory='0', "
@@ -428,7 +431,8 @@ ATF_TEST_CASE_BODY(output__some_values)
         .build();
     ATF_REQUIRE_EQ(
         "metadata{allowed_architectures='abc', allowed_platforms='', "
-        "description='', has_cleanup='false', is_exclusive='true', "
+        "description='', execenv='', execenv_jail='', "
+        "has_cleanup='false', is_exclusive='true', "
         "required_configs='', "
         "required_disk_space='0', required_files='bar foo', "
         "required_memory='1.00K', "

diff --git a/contrib/kyua/model/test_case_test.cpp b/contrib/kyua/model/test_case_test.cpp
@@ -200,7 +200,8 @@ ATF_TEST_CASE_BODY(test_case__output)
     ATF_REQUIRE_EQ(
         "test_case{name='the-name', "
         "metadata=metadata{allowed_architectures='', allowed_platforms='foo', "
-        "custom.bar='baz', description='', has_cleanup='false', "
+        "custom.bar='baz', description='', execenv='', execenv_jail='', "
+        "has_cleanup='false', "
         "is_exclusive='false', "
         "required_configs='', required_disk_space='0', required_files='', "
         "required_memory='0', "

diff --git a/contrib/kyua/model/test_program_test.cpp b/contrib/kyua/model/test_program_test.cpp
@@ -544,7 +544,8 @@ check_output__no_test_cases(void)
         "test_program{interface='plain', binary='binary/path', "
         "root='/the/root', test_suite='suite-name', "
         "metadata=metadata{allowed_architectures='a', allowed_platforms='', "
-        "description='', has_cleanup='false', is_exclusive='false', "
+        "description='', execenv='', execenv_jail='', "
+        "has_cleanup='false', is_exclusive='false', "
         "required_configs='', required_disk_space='0', required_files='', "
         "required_memory='0', "
         "required_programs='', required_user='', timeout='300'}, "
@@ -593,21 +594,23 @@ check_output__some_test_cases(void)
         "test_program{interface='plain', binary='binary/path', "
         "root='/the/root', test_suite='suite-name', "
         "metadata=metadata{allowed_architectures='a', allowed_platforms='', "
-        "description='', has_cleanup='false', is_exclusive='false', "
+        "description='', execenv='', execenv_jail='', "
+        "has_cleanup='false', is_exclusive='false', "
         "required_configs='', required_disk_space='0', required_files='', "
         "required_memory='0', "
         "required_programs='', required_user='', timeout='300'}, "
         "test_cases=map("
         "another-name=test_case{name='another-name', "
         "metadata=metadata{allowed_architectures='a', allowed_platforms='', "
-        "description='', has_cleanup='false', is_exclusive='false', "
+        "description='', execenv='', execenv_jail='', "
+        "has_cleanup='false', is_exclusive='false', "
         "required_configs='', required_disk_space='0', required_files='', "
         "required_memory='0', "
         "required_programs='', required_user='', timeout='300'}}, "
         "the-name=test_case{name='the-name', "
         "metadata=metadata{allowed_architectures='a', allowed_platforms='foo', "
-        "custom.bar='baz', description='', has_cleanup='false', "
-        "is_exclusive='false', "
+        "custom.bar='baz', description='', execenv='', execenv_jail='', "
+        "has_cleanup='false', is_exclusive='false', "
         "required_configs='', required_disk_space='0', required_files='', "
         "required_memory='0', "
         "required_programs='', required_user='', timeout='300'}})}",