Merge pull request twitter#75 from TomekIdczak97/ungraceful

Integration tests fail assertion fix
michalbiesek · Sep 16, 2019 · 6777c82 · 6777c82
2 parents 047d766 + fb13071
commit 6777c82
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt
@@ -2,6 +2,10 @@ set(test_name integration)
 
 include(FindPythonInterp)
 
+if(USE_PMEM)
+    set(test_arg --pmem)
+endif(USE_PMEM)
+
 add_test(NAME ${test_name}
-         COMMAND ${PYTHON_EXECUTABLE} test_twemcache.py
+         COMMAND ${PYTHON_EXECUTABLE} test_twemcache.py ${test_arg}
          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/test/integration/test_twemcache.py b/test/integration/test_twemcache.py
@@ -2,6 +2,8 @@
 from base import GenericPmemTest
 
 import os
+import sys
+import argparse
 import unittest
 import ConfigParser
 import StringIO
@@ -11,12 +13,13 @@ def defineTest(suite, fname, test_type):
     test.load('twemcache/' + fname)
     suite.addTest(test)
 
-def twemcache():
+def twemcache(pmem_flag=False):
     suite = unittest.TestSuite()
     for fname in sorted(os.listdir('twemcache')):
         if not os.path.isdir('twemcache/' + fname):
             defineTest(suite, fname, GenericTest)
-            defineTest(suite, fname, GenericPmemTest)
+            if pmem_flag:
+                defineTest(suite, fname, GenericPmemTest)
 
     return suite
 
@@ -33,5 +36,11 @@ def removeDevice():
         os.remove(devpath)
 
 if __name__ == '__main__':
-    unittest.TextTestRunner(verbosity=2).run(twemcache())
+    parser = argparse.ArgumentParser(description='Run integration test.')
+    parser.add_argument("--pmem", help="use pmem", action="store_true")
+    args = parser.parse_args()
+    result = unittest.TextTestRunner(verbosity=2).run(twemcache(args.pmem))
     removeDevice()
+    if result.wasSuccessful():
+        sys.exit(0)
+    sys.exit(1)