feat: 支持uts容器
BREAKING CHANGE: 支持uts容器对外变更: 支持sethostname Close #I6A7C8 Signed-off-by: zhushengle <zhushengle@huawei.com> Change-Id: I2504f77c37bb4149861673c81688bd112563c24b
This commit is contained in:
@@ -35,6 +35,9 @@ config("container_config") {
|
||||
if (defined(LOSCFG_USER_TEST_PID_CONTAINER)) {
|
||||
cflags += [ "-DLOSCFG_USER_TEST_PID_CONTAINER" ]
|
||||
}
|
||||
if (defined(LOSCFG_USER_TEST_UTS_CONTAINER)) {
|
||||
cflags += [ "-DLOSCFG_USER_TEST_UTS_CONTAINER" ]
|
||||
}
|
||||
cflags_cc = cflags
|
||||
}
|
||||
|
||||
|
||||
@@ -126,6 +126,30 @@ HWTEST_F(ContainerTest, ItPidContainer023, TestSize.Level0)
|
||||
ItPidContainer023();
|
||||
}
|
||||
#endif
|
||||
#if defined(LOSCFG_USER_TEST_UTS_CONTAINER)
|
||||
/**
|
||||
* @tc.name: Container_UTS_Test_001
|
||||
* @tc.desc: uts container function test case
|
||||
* @tc.type: FUNC
|
||||
* @tc.require: issueI6A7C8
|
||||
* @tc.author:
|
||||
*/
|
||||
HWTEST_F(ContainerTest, ItUtsContainer001, TestSize.Level0)
|
||||
{
|
||||
ItUtsContainer001();
|
||||
}
|
||||
/**
|
||||
* @tc.name: Container_UTS_Test_002
|
||||
* @tc.desc: uts container function test case
|
||||
* @tc.type: FUNC
|
||||
* @tc.require: issueI6A7C8
|
||||
* @tc.author:
|
||||
*/
|
||||
HWTEST_F(ContainerTest, ItUtsContainer002, TestSize.Level0)
|
||||
{
|
||||
ItUtsContainer002();
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(LOSCFG_USER_TEST_FULL)
|
||||
@@ -394,6 +418,19 @@ HWTEST_F(ContainerTest, ItPidContainer024, TestSize.Level0)
|
||||
ItPidContainer024();
|
||||
}
|
||||
#endif
|
||||
#if defined(LOSCFG_USER_TEST_UTS_CONTAINER)
|
||||
/**
|
||||
* @tc.name: Container_UTS_Test_003
|
||||
* @tc.desc: uts container function test case
|
||||
* @tc.type: FUNC
|
||||
* @tc.require: issueI6A7C8
|
||||
* @tc.author:
|
||||
*/
|
||||
HWTEST_F(ContainerTest, ItUtsContainer003, TestSize.Level0)
|
||||
{
|
||||
ItUtsContainer003();
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
} // namespace OHOS
|
||||
|
||||
|
||||
@@ -83,6 +83,10 @@ void ItContainer001(void);
|
||||
#if defined(LOSCFG_USER_TEST_PID_CONTAINER)
|
||||
void ItPidContainer023(void);
|
||||
#endif
|
||||
#if defined(LOSCFG_USER_TEST_UTS_CONTAINER)
|
||||
void ItUtsContainer001(void);
|
||||
void ItUtsContainer002(void);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(LOSCFG_USER_TEST_FULL)
|
||||
@@ -110,6 +114,9 @@ void ItPidContainer021(void);
|
||||
void ItPidContainer022(void);
|
||||
void ItPidContainer024(void);
|
||||
#endif
|
||||
#if defined(LOSCFG_USER_TEST_UTS_CONTAINER)
|
||||
void ItUtsContainer003(void);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif /* _IT_CONTAINER_TEST_H */
|
||||
|
||||
@@ -36,32 +36,42 @@ common_include_dirs = [
|
||||
|
||||
sources_entry = [ "$TEST_UNITTEST_DIR/container/It_container_test.cpp" ]
|
||||
|
||||
sources_smoke = [
|
||||
"$TEST_UNITTEST_DIR/container/smoke/It_container_001.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/smoke/It_pid_container_023.cpp",
|
||||
]
|
||||
sources_smoke = [ "$TEST_UNITTEST_DIR/container/smoke/It_container_001.cpp" ]
|
||||
sources_full = []
|
||||
|
||||
sources_full = [
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_001.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_002.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_003.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_004.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_006.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_007.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_008.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_009.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_010.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_011.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_012.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_013.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_014.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_015.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_016.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_017.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_018.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_019.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_020.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_021.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_022.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_024.cpp",
|
||||
]
|
||||
if (defined(LOSCFG_USER_TEST_PID_CONTAINER)) {
|
||||
sources_smoke +=
|
||||
[ "$TEST_UNITTEST_DIR/container/smoke/It_pid_container_023.cpp" ]
|
||||
sources_full += [
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_001.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_002.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_003.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_004.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_006.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_007.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_008.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_009.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_010.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_011.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_012.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_013.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_014.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_015.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_016.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_017.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_018.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_019.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_020.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_021.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_022.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/full/It_pid_container_024.cpp",
|
||||
]
|
||||
}
|
||||
if (defined(LOSCFG_USER_TEST_UTS_CONTAINER)) {
|
||||
sources_smoke += [
|
||||
"$TEST_UNITTEST_DIR/container/smoke/It_uts_container_001.cpp",
|
||||
"$TEST_UNITTEST_DIR/container/smoke/It_uts_container_002.cpp",
|
||||
]
|
||||
sources_full +=
|
||||
[ "$TEST_UNITTEST_DIR/container/full/It_uts_container_003.cpp" ]
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@ static int ChildFunClone1(void *p)
|
||||
{
|
||||
(void)p;
|
||||
pid_t pid = getpid();
|
||||
const int COUNT = 1000;
|
||||
const int COUNT = 100;
|
||||
int childPid;
|
||||
int childFunRet = (int)pid;
|
||||
int processCount = 0;
|
||||
|
||||
@@ -35,7 +35,7 @@ static int ChildFun(void *p)
|
||||
int ret;
|
||||
int status = 0;
|
||||
pid_t pid;
|
||||
int count = 1000;
|
||||
int count = 100;
|
||||
int processCount = 0;
|
||||
|
||||
pid = getpid();
|
||||
|
||||
81
testsuites/unittest/container/full/It_uts_container_003.cpp
Normal file
81
testsuites/unittest/container/full/It_uts_container_003.cpp
Normal file
@@ -0,0 +1,81 @@
|
||||
/*
|
||||
* Copyright (c) 2023-2023 Huawei Device Co., Ltd. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without modification,
|
||||
* are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||
* conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||
* of conditions and the following disclaimer in the documentation and/or other materials
|
||||
* provided with the distribution.
|
||||
*
|
||||
* 3. Neither the name of the copyright holder nor the names of its contributors may be used
|
||||
* to endorse or promote products derived from this software without specific prior written
|
||||
* permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
|
||||
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
|
||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
||||
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
||||
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
#include "It_container_test.h"
|
||||
#include "sys/resource.h"
|
||||
#include "sys/wait.h"
|
||||
#include "pthread.h"
|
||||
#include "sched.h"
|
||||
|
||||
const int SLEEP_TIME_US = 1000;
|
||||
const int LOOP_NUM = 100;
|
||||
|
||||
static int ChildFunc(void *arg)
|
||||
{
|
||||
(void)arg;
|
||||
usleep(SLEEP_TIME_US);
|
||||
exit(EXIT_CODE_ERRNO_5);
|
||||
}
|
||||
|
||||
static int GroupProcess(void *arg)
|
||||
{
|
||||
(void)arg;
|
||||
int ret;
|
||||
int status = 0;
|
||||
|
||||
for (int i = 0; i < LOOP_NUM; i++) {
|
||||
int argTmp = CHILD_FUNC_ARG;
|
||||
auto pid = CloneWrapper(ChildFunc, CLONE_NEWUTS, &argTmp);
|
||||
if (pid == -1) {
|
||||
return EXIT_CODE_ERRNO_1;
|
||||
}
|
||||
|
||||
ret = waitpid(pid, &status, 0);
|
||||
status = WEXITSTATUS(status);
|
||||
if (status != EXIT_CODE_ERRNO_5) {
|
||||
return EXIT_CODE_ERRNO_2;
|
||||
}
|
||||
}
|
||||
|
||||
exit(EXIT_CODE_ERRNO_5);
|
||||
}
|
||||
|
||||
void ItUtsContainer003(void)
|
||||
{
|
||||
int ret;
|
||||
int status = 0;
|
||||
int arg = CHILD_FUNC_ARG;
|
||||
auto pid = CloneWrapper(GroupProcess, CLONE_NEWUTS, &arg);
|
||||
ASSERT_NE(pid, -1);
|
||||
|
||||
ret = waitpid(pid, &status, 0);
|
||||
ASSERT_EQ(ret, pid);
|
||||
status = WEXITSTATUS(status);
|
||||
ASSERT_EQ(status, EXIT_CODE_ERRNO_5);
|
||||
}
|
||||
58
testsuites/unittest/container/smoke/It_uts_container_001.cpp
Normal file
58
testsuites/unittest/container/smoke/It_uts_container_001.cpp
Normal file
@@ -0,0 +1,58 @@
|
||||
/*
|
||||
* Copyright (c) 2023-2023 Huawei Device Co., Ltd. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without modification,
|
||||
* are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||
* conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||
* of conditions and the following disclaimer in the documentation and/or other materials
|
||||
* provided with the distribution.
|
||||
*
|
||||
* 3. Neither the name of the copyright holder nor the names of its contributors may be used
|
||||
* to endorse or promote products derived from this software without specific prior written
|
||||
* permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
|
||||
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
|
||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
||||
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
||||
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
#include "It_container_test.h"
|
||||
|
||||
static int ChildFunc(void *arg)
|
||||
{
|
||||
int value = *((int*)arg);
|
||||
if (value != CHILD_FUNC_ARG) {
|
||||
return EXIT_CODE_ERRNO_1;
|
||||
}
|
||||
return EXIT_CODE_ERRNO_2;
|
||||
}
|
||||
|
||||
void ItUtsContainer001(void)
|
||||
{
|
||||
int ret;
|
||||
|
||||
int arg = CHILD_FUNC_ARG;
|
||||
auto pid = CloneWrapper(ChildFunc, CLONE_NEWUTS, &arg);
|
||||
ASSERT_NE(pid, -1);
|
||||
|
||||
int status;
|
||||
ret = waitpid(pid, &status, 0);
|
||||
ASSERT_EQ(ret, pid);
|
||||
|
||||
ret = WIFEXITED(status);
|
||||
ASSERT_NE(ret, 0);
|
||||
|
||||
int exitCode = WEXITSTATUS(status);
|
||||
ASSERT_EQ(exitCode, EXIT_CODE_ERRNO_2);
|
||||
}
|
||||
97
testsuites/unittest/container/smoke/It_uts_container_002.cpp
Normal file
97
testsuites/unittest/container/smoke/It_uts_container_002.cpp
Normal file
@@ -0,0 +1,97 @@
|
||||
/*
|
||||
* Copyright (c) 2023-2023 Huawei Device Co., Ltd. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without modification,
|
||||
* are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||
* conditions and the following disclaimer.
|
||||
*
|
||||
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||
* of conditions and the following disclaimer in the documentation and/or other materials
|
||||
* provided with the distribution.
|
||||
*
|
||||
* 3. Neither the name of the copyright holder nor the names of its contributors may be used
|
||||
* to endorse or promote products derived from this software without specific prior written
|
||||
* permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
|
||||
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
|
||||
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
||||
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
||||
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
#include "It_container_test.h"
|
||||
#include "sys/utsname.h"
|
||||
|
||||
static int ChildFunc(void *arg)
|
||||
{
|
||||
int ret;
|
||||
int value = *((int*)arg);
|
||||
if (value != CHILD_FUNC_ARG) {
|
||||
return EXIT_CODE_ERRNO_1;
|
||||
}
|
||||
sleep(1);
|
||||
|
||||
struct utsname newName;
|
||||
ret = uname(&newName);
|
||||
if (ret != 0) {
|
||||
return EXIT_CODE_ERRNO_2;
|
||||
}
|
||||
|
||||
const char *name = "TestHostName";
|
||||
ret = sethostname(name, strlen(name));
|
||||
if (ret != 0) {
|
||||
return EXIT_CODE_ERRNO_3;
|
||||
}
|
||||
|
||||
struct utsname newName1;
|
||||
ret = uname(&newName1);
|
||||
if (ret != 0) {
|
||||
return EXIT_CODE_ERRNO_4;
|
||||
}
|
||||
|
||||
ret = strcmp(newName.nodename, newName1.nodename);
|
||||
if (ret == 0) {
|
||||
return EXIT_CODE_ERRNO_5;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void ItUtsContainer002(void)
|
||||
{
|
||||
int ret;
|
||||
char *stack = (char*)mmap(NULL, STACK_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_STACK, -1, 0);
|
||||
ASSERT_TRUE(stack != NULL);
|
||||
char *stackTop = stack + STACK_SIZE;
|
||||
|
||||
struct utsname oldName;
|
||||
ret = uname(&oldName);
|
||||
ASSERT_EQ(ret, 0);
|
||||
|
||||
int arg = CHILD_FUNC_ARG;
|
||||
auto pid = clone(ChildFunc, stackTop, CLONE_NEWUTS, &arg);
|
||||
(void)munmap(stack, STACK_SIZE);
|
||||
ASSERT_NE(pid, -1);
|
||||
|
||||
int status;
|
||||
ret = waitpid(pid, &status, 0);
|
||||
ASSERT_EQ(ret, pid);
|
||||
|
||||
int exitCode = WEXITSTATUS(status);
|
||||
ASSERT_EQ(exitCode, 0);
|
||||
|
||||
struct utsname oldName1;
|
||||
ret = uname(&oldName1);
|
||||
ASSERT_EQ(ret, 0);
|
||||
|
||||
ret = strcmp(oldName.nodename, oldName1.nodename);
|
||||
ASSERT_EQ(ret, 0);
|
||||
}
|
||||
Reference in New Issue
Block a user