test: disable test due to pmem#5641

Signed-off-by: Tomasz Gromadzki <tomasz.gromadzki@intel.com>

src/test/ex_libpmem2/TESTS.py

@@ -4,6 +4,7 @@
 #
 import futils
 import testframework as t
+from testframework import granularity as g
 
 
 @t.require_build(['debug', 'release'])
@@ -73,6 +74,12 @@ def run(self, ctx):
         ctx.exec(example_path, *args, stdout_file='out4.log')
 
 
+# XXX
+# Manually disabled for pmemcheck for g.PAGE until ready fix for
+# https://github.com/pmem/pmdk/issues/5641
+# additionall test TEST501 has been added to cover non-pmemcheck configs.
+@g.require_granularity(g.CACHELINE, g.BYTE) # to be removed when fix available
+@t.require_valgrind_enabled('pmemcheck') # to be removed when fix available
 class TEST5(EX_LIBPMEM2):
 
     def run(self, ctx):
@@ -81,6 +88,11 @@ def run(self, ctx):
         ctx.exec(example_path, "write", file_path, "foobar")
         ctx.exec(example_path, "read", file_path, stdout_file='out5.log')
 
+# XXX see TEST5 above
+@t.require_valgrind_disabled('pmemcheck')
+class TEST501(TEST5): # to be removed when fix available
+
+    pass
 
 @t.windows_exclude
 # This test case would require two VALGRIND_SET_CLEAN() calls

src/test/unittest/granularity.py

@@ -147,12 +147,21 @@ def filter(cls, config, msg, tc):
 
         """
         req_gran, kwargs = ctx.get_requirement(tc, 'granularity', None)
+        disabled, _ = ctx.get_requirement(tc, 'disabled_granularity', ())
+
 
         # remove granularities if respective test directories in
         # test config are not defined
         conf_defined = [c for c in config.granularity
                         if c.testdir_defined(config)]
 
+        for tg in conf_defined:
+            if tg in disabled:
+                futils.Message("granularity '{}' is disabled by test"
+                      .format(tg))
+#                raise futils.Skip(
+#                      "granularity '{}' is disabled by test"
+#                      .format(tg))
         if req_gran == Non:
             return [Non(**kwargs), ]
 
@@ -166,6 +175,10 @@ def filter(cls, config, msg, tc):
             tmp_req_gran = req_gran
 
         filtered = ctx.filter_contexts(conf_defined, tmp_req_gran)
+
+        #for tg in disabled:
+        #    filtered.remove(tg)
+
 
         kwargs['tc_dirname'] = tc.tc_dirname
 
@@ -280,6 +293,19 @@ def wrapped(tc):
         return tc
     return wrapped
 
+def require_granularity_disabled(*granularity, **kwargs):
+    for g in granularity:
+        if not isinstance(g, _Granularity):
+            raise ValueError('selected granularity {} is invalid'
+                             .format(g))
+
+    enum_values = [g.value for g in granularity]
+
+    def wrapped(tc):
+        ctx.add_requirement(tc, 'disabled_granularity', enum_values, **kwargs)
+        return tc
+    return wrapped
+
 
 def no_testdir(**kwargs):
     def wrapped(tc):