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

Submitted by Pavel Tikhomirov on June 25, 2018, 2:39 p.m.

Details

Message ID 20180625143955.25435-2-ptikhomirov@virtuozzo.com
State New
Series "Series without cover letter"
Headers show

Commit Message

Pavel Tikhomirov June 25, 2018, 2:39 p.m.
We already check (root, mountpoint) pairs preserve, so do the same for
(root, mountpoint, shared, slave) fours.

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

Patch hide | download patch | download mbox

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: