Make sure environment is clean before UT run

microsoft · Aug 18, 2017 · a9bc497 · a9bc497
1 parent 67056dd
commit a9bc497
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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<wstring> 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<mi::Container_Process_Class_Provider>(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<wstring> 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<mi::Container_Process_Class_Provider>(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");
     }
 };