From 5042c5fc437bb6b4a57951901290b1bd9246b127 Mon Sep 17 00:00:00 2001 From: Michal Mielewczyk Date: Thu, 12 Sep 2019 09:20:12 -0400 Subject: [PATCH] pyocf: adapt tests to new inactive cores stats. Signed-off-by: Michal Mielewczyk --- tests/functional/pyocf/types/cache.py | 9 +++++++-- tests/functional/pyocf/types/stats/cache.py | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/functional/pyocf/types/cache.py b/tests/functional/pyocf/types/cache.py index c8fcf7c..995356a 100644 --- a/tests/functional/pyocf/types/cache.py +++ b/tests/functional/pyocf/types/cache.py @@ -468,9 +468,14 @@ class Cache: "size": CacheLines(cache_info.size, line_size), "inactive": { "occupancy": CacheLines( - cache_info.inactive.occupancy, line_size + cache_info.inactive.occupancy.value, line_size + ), + "dirty": CacheLines( + cache_info.inactive.dirty.value, line_size + ), + "clean": CacheLines( + cache_info.inactive.clean.value, line_size ), - "dirty": CacheLines(cache_info.inactive.dirty, line_size), }, "occupancy": CacheLines(cache_info.occupancy, line_size), "dirty": CacheLines(cache_info.dirty, line_size), diff --git a/tests/functional/pyocf/types/stats/cache.py b/tests/functional/pyocf/types/stats/cache.py index ae85de5..b9b192f 100644 --- a/tests/functional/pyocf/types/stats/cache.py +++ b/tests/functional/pyocf/types/stats/cache.py @@ -4,10 +4,11 @@ # from ctypes import c_uint8, c_uint32, c_uint64, c_bool, c_int, Structure +from pyocf.types.stats.shared import _Stat class _Inactive(Structure): - _fields_ = [("occupancy", c_uint32), ("dirty", c_uint32)] + _fields_ = [("occupancy", _Stat), ("clean", _Stat), ("dirty", _Stat)] class _FallbackPt(Structure):