Match-id-69948825c312d1fb74e2e9658afb547da4da2769

This commit is contained in:
BianTanggui
2020-05-28 20:19:42 +08:00
parent cf5e6ef2d1
commit a4f71f7b3d
2 changed files with 8 additions and 7 deletions

View File

@@ -696,9 +696,11 @@ int Process(int argc, char **argv)
} }
#ifdef gtest #ifdef gtest
int _main(int argc, char **argv) { int _main(int argc, char **argv)
{
#else #else
int main(int argc, char **argv) { int main(int argc, char **argv)
{
#endif #endif
int ret = Process(argc, argv); int ret = Process(argc, argv);
return ret; return ret;

View File

@@ -55,7 +55,7 @@ struct CmdArgs {
int stub_setns(int fd, int nstype) int stub_setns(int fd, int nstype)
{ {
return 0; return 0;
} }
int Stub_EnterNsByFd_Success(int fd, int nsType) int Stub_EnterNsByFd_Success(int fd, int nsType)
@@ -69,7 +69,7 @@ int stub_open(const char *path, int flags)
} }
int stub_mount_success(const char *source, const char *target, int stub_mount_success(const char *source, const char *target,
const char *filesystemtype, unsigned long mountflags, const void *data) const char *filesystemtype, unsigned long mountflags, const void *data)
{ {
return 0; return 0;
} }
@@ -120,8 +120,7 @@ int Stub_SetupDriverCgroup_Fail(FILE *cgroupAllow)
return 0; return 0;
} }
class Test_Fhho : public Test class Test_Fhho : public Test {
{
protected: protected:
static void SetUpTestCase() static void SetUpTestCase()
{ {
@@ -217,7 +216,7 @@ TEST_F(Test_Fhho, GetNsPath)
{ {
char containerNsPath[BUF_SIZE] = {0}; char containerNsPath[BUF_SIZE] = {0};
int containerPid = 1; int containerPid = 1;
EXPECT_LE(0, GetNsPath(containerPid,"mnt", containerNsPath, BUF_SIZE)); EXPECT_LE(0, GetNsPath(containerPid, "mnt", containerNsPath, BUF_SIZE));
} }
TEST_F(Test_Fhho, GetSelfNsPath) TEST_F(Test_Fhho, GetSelfNsPath)