From a9bc4973abd3bbd6c2b0f3ed9f272c882dd5fd2c Mon Sep 17 00:00:00 2001 From: Sambit Mishra Date: Fri, 18 Aug 2017 20:38:15 +0000 Subject: [PATCH] Make sure environment is clean before UT run --- ...er_ContainerInventory_Class_Provider_UnitTest.cpp | 4 +++- ...tainer_ImageInventory_Class_Provider_UnitTest.cpp | 5 ++++- .../Container_Process_Class_Provider_UnitTest.cpp | 12 ++++++++---- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/test/code/providers/Container_ContainerInventory_Class_Provider_UnitTest.cpp b/test/code/providers/Container_ContainerInventory_Class_Provider_UnitTest.cpp index 11e87ce04..6843c5244 100644 --- a/test/code/providers/Container_ContainerInventory_Class_Provider_UnitTest.cpp +++ b/test/code/providers/Container_ContainerInventory_Class_Provider_UnitTest.cpp @@ -33,8 +33,10 @@ class ContainerInventoryTest : public CppUnit::TestFixture public: void setUp() { - // Get some images to use fputc('\n', stdout); + //delete all container + system("docker ps -a -q | xargs docker rm -f"); + // Get some images to use TestHelper::RunCommand("docker pull hello-world"); TestHelper::RunCommand("rm -f /var/opt/microsoft/docker-cimprov/state/ContainerInventory/*"); } diff --git a/test/code/providers/Container_ImageInventory_Class_Provider_UnitTest.cpp b/test/code/providers/Container_ImageInventory_Class_Provider_UnitTest.cpp index 614e149b7..6369139ae 100644 --- a/test/code/providers/Container_ImageInventory_Class_Provider_UnitTest.cpp +++ b/test/code/providers/Container_ImageInventory_Class_Provider_UnitTest.cpp @@ -30,8 +30,11 @@ class ImageInventoryTest : public CppUnit::TestFixture public: void setUp() { - // Get some images to use fputc('\n', stdout); + //clean up test environment + system("docker ps -a -q | xargs docker rm -f"); + system("docker images -q | xargs docker rmi "); + // Get some images to use TestHelper::RunCommand("docker pull hello-world"); TestHelper::RunCommand("docker pull centos"); TestHelper::RunCommand("rm -f /var/opt/microsoft/docker-cimprov/state/ImageInventory/*"); diff --git a/test/code/providers/Container_Process_Class_Provider_UnitTest.cpp b/test/code/providers/Container_Process_Class_Provider_UnitTest.cpp index a8b3ed475..42ffd9baa 100644 --- a/test/code/providers/Container_Process_Class_Provider_UnitTest.cpp +++ b/test/code/providers/Container_Process_Class_Provider_UnitTest.cpp @@ -25,6 +25,9 @@ class ContainerProcessTest : public CppUnit::TestFixture { processCmd.push_back(wstring(L"/bin/sh -c sleep inf;")); processCmd.push_back(wstring(L"sleep inf")); + fputc('\n', stdout); + //delete all running containers + system("docker ps -a -q | xargs docker rm -f"); } void tearDown() @@ -40,7 +43,7 @@ class ContainerProcessTest : public CppUnit::TestFixture vector m_keyNames; m_keyNames.push_back(L"InstanceID"); - TestHelper::RunCommand("docker run -d --name=k8s_cpt.sandboxname_cptpodname_cptnamepsace_cptid ubuntu /bin/sh -c \"sleep inf;\""); + system("docker run -d --name=k8s_cpt.sandboxname_cptpodname_cptnamepsace_cptid ubuntu /bin/sh -c \"sleep inf;\""); StandardTestEnumerateInstances(m_keyNames, context, CALL_LOCATION(errMsg)); CPPUNIT_ASSERT_EQUAL(2, context.Size()); @@ -62,7 +65,8 @@ class ContainerProcessTest : public CppUnit::TestFixture CPPUNIT_ASSERT(context[i].GetProperty(L"Id", CALL_LOCATION(errMsg)).GetValue_MIString(CALL_LOCATION(errMsg)).length()); CPPUNIT_ASSERT_EQUAL(wstring(L"k8s_cpt.sandboxname_cptpodname_cptnamepsace_cptid"), context[i].GetProperty(L"Name", CALL_LOCATION(errMsg)).GetValue_MIString(CALL_LOCATION(errMsg))); } - TestHelper::RunCommand("docker rm -f k8s_cpt.sandboxname_cptpodname_cptnamepsace_cptid"); + system("docker rm -f k8s_cpt.sandboxname_cptpodname_cptnamepsace_cptid"); + } void TestNonk8EnumerateInstances() @@ -72,7 +76,7 @@ class ContainerProcessTest : public CppUnit::TestFixture vector m_keyNames; m_keyNames.push_back(L"InstanceID"); - TestHelper::RunCommand("docker run -d --name=ContainerProcessTest ubuntu /bin/sh -c \"sleep inf;\""); + system("docker run -d --name=ContainerProcessTest ubuntu /bin/sh -c \"sleep inf;\""); StandardTestEnumerateInstances(m_keyNames, context, CALL_LOCATION(errMsg)); CPPUNIT_ASSERT_EQUAL(2, context.Size()); @@ -94,7 +98,7 @@ class ContainerProcessTest : public CppUnit::TestFixture CPPUNIT_ASSERT(context[i].GetProperty(L"Id", CALL_LOCATION(errMsg)).GetValue_MIString(CALL_LOCATION(errMsg)).length()); CPPUNIT_ASSERT_EQUAL(wstring(L"ContainerProcessTest"),context[i].GetProperty(L"Name", CALL_LOCATION(errMsg)).GetValue_MIString(CALL_LOCATION(errMsg))); } - TestHelper::RunCommand("docker rm -f ContainerProcessTest"); + system("docker rm -f ContainerProcessTest"); } };