[Devel] [PATCH criu-stable 2/3] zdtm.py: also check that sharing options are restored for mounts

Pavel Tikhomirov ptikhomirov at virtuozzo.com
Mon Jun 25 17:39:54 MSK 2018


We already check (root, mountpoint) pairs preserve, so do the same for
(root, mountpoint, shared, slave) fours.

Signed-off-by: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
---
 test/zdtm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/zdtm.py b/test/zdtm.py
index 5751ca827..b4c002c21 100755
--- a/test/zdtm.py
+++ b/test/zdtm.py
@@ -1245,7 +1245,7 @@ do_sbs = False
 
 		cmounts = []
 		try:
-			r = re.compile("^\S+\s\S+\s\S+\s(\S+)\s(\S+)")
+			r = re.compile("^\S+\s\S+\s\S+\s(\S+)\s(\S+)\s\S+\s[^-]*?(shared)?[^-]*?(master)?[^-]*?-")
 			for m in open("/proc/%s/root/proc/%s/mountinfo" % (test.getpid(), pid)):
 				cmounts.append(r.match(m).groups())
 		except IOError, e:
-- 
2.17.0



More information about the Devel mailing list