From patchwork Fri Oct 28 11:01:47 2016
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: zdtm: Split long .desc lines
From: Pavel Emelyanov <xemul@virtuozzo.com>
X-Patchwork-Id: 2278
Message-Id: <5813301B.3090203@virtuozzo.com>
To: CRIU <criu@openvz.org>
Date: Fri, 28 Oct 2016 14:01:47 +0300

Done with python pprint module (indent = 4, width = 80)
for files with more than one field in and with length
exceeding 80 characters.

Travised-by: https://travis-ci.org/xemul/criu/jobs/171350152
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
---
 test/zdtm/static/bridge.desc         | 8 +++++++-
 test/zdtm/static/cgroup02.desc       | 5 ++++-
 test/zdtm/static/cgroup_stray.desc   | 5 ++++-
 test/zdtm/static/cgroupns.desc       | 5 ++++-
 test/zdtm/static/cr_veth.desc        | 5 ++++-
 test/zdtm/static/macvlan.desc        | 9 ++++++++-
 test/zdtm/static/mnt_enablefs.desc   | 5 ++++-
 test/zdtm/static/mnt_ext_manual.desc | 5 ++++-
 test/zdtm/static/mnt_ext_master.desc | 4 +++-
 test/zdtm/static/mnt_tracefs.desc    | 4 +++-
 test/zdtm/static/netns-nf.desc       | 7 ++++++-
 test/zdtm/static/netns.desc          | 4 +++-
 12 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/test/zdtm/static/bridge.desc b/test/zdtm/static/bridge.desc
index 8af1df7..9d64973 100644
--- a/test/zdtm/static/bridge.desc
+++ b/test/zdtm/static/bridge.desc
@@ -1 +1,7 @@
-{'flavor': 'ns uns', 'deps': [ '/bin/sh', '/usr/bin/sort', '/bin/grep', '/sbin/ip', '/usr/bin/diff'], 'flags': 'suid'}
+{   'deps': [   '/bin/sh',
+                '/usr/bin/sort',
+                '/bin/grep',
+                '/sbin/ip',
+                '/usr/bin/diff'],
+    'flags': 'suid',
+    'flavor': 'ns uns'}
diff --git a/test/zdtm/static/cgroup02.desc b/test/zdtm/static/cgroup02.desc
index 598cedf..df17a57 100644
--- a/test/zdtm/static/cgroup02.desc
+++ b/test/zdtm/static/cgroup02.desc
@@ -1 +1,4 @@
-{'flavor': 'h', 'flags': 'suid', 'dopts': '--manage-cgroups --cgroup-root name=zdtmtst:/prefix', 'ropts': '--manage-cgroups --cgroup-root /newroot --cgroup-root name=zdtmtst:/prefix'}
+{   'dopts': '--manage-cgroups --cgroup-root name=zdtmtst:/prefix',
+    'flags': 'suid',
+    'flavor': 'h',
+    'ropts': '--manage-cgroups --cgroup-root /newroot --cgroup-root name=zdtmtst:/prefix'}
diff --git a/test/zdtm/static/cgroup_stray.desc b/test/zdtm/static/cgroup_stray.desc
index 65748f5..32235b9 100644
--- a/test/zdtm/static/cgroup_stray.desc
+++ b/test/zdtm/static/cgroup_stray.desc
@@ -1 +1,4 @@
-{'flavor': 'h ns', 'flags': 'suid', 'feature': 'cgroupns', 'opts': '--manage-cgroups'}
+{   'feature': 'cgroupns',
+    'flags': 'suid',
+    'flavor': 'h ns',
+    'opts': '--manage-cgroups'}
diff --git a/test/zdtm/static/cgroupns.desc b/test/zdtm/static/cgroupns.desc
index 88a9100..80dd710 100644
--- a/test/zdtm/static/cgroupns.desc
+++ b/test/zdtm/static/cgroupns.desc
@@ -1 +1,4 @@
-{'flavor': 'h', 'flags': 'suid', 'feature': 'cgroupns', 'opts': '--manage-cgroups'}
+{   'feature': 'cgroupns',
+    'flags': 'suid',
+    'flavor': 'h',
+    'opts': '--manage-cgroups'}
diff --git a/test/zdtm/static/cr_veth.desc b/test/zdtm/static/cr_veth.desc
index 407a7a8..0c2cc20 100644
--- a/test/zdtm/static/cr_veth.desc
+++ b/test/zdtm/static/cr_veth.desc
@@ -1 +1,4 @@
-{'flavor': 'ns uns', 'deps': [ '/bin/sh', '/bin/sed', '/bin/grep', '/sbin/ip', '/usr/bin/diff'], 'flags': 'suid', 'ropts': '--external veth[zdtmvthc0]:zdtmvthh0@zdtmbr0'}
+{   'deps': ['/bin/sh', '/bin/sed', '/bin/grep', '/sbin/ip', '/usr/bin/diff'],
+    'flags': 'suid',
+    'flavor': 'ns uns',
+    'ropts': '--external veth[zdtmvthc0]:zdtmvthh0@zdtmbr0'}
diff --git a/test/zdtm/static/macvlan.desc b/test/zdtm/static/macvlan.desc
index 49e90d7..a9c2ae5 100644
--- a/test/zdtm/static/macvlan.desc
+++ b/test/zdtm/static/macvlan.desc
@@ -1 +1,8 @@
-{'flavor': 'ns uns', 'deps': [ '/bin/sh', '/usr/bin/sort', '/bin/grep', '/sbin/ip', '/usr/bin/diff'], 'flags': 'suid', 'ropts': '--external macvlan[zdtmmvlan0]:zdtmbr0'}
+{   'deps': [   '/bin/sh',
+                '/usr/bin/sort',
+                '/bin/grep',
+                '/sbin/ip',
+                '/usr/bin/diff'],
+    'flags': 'suid',
+    'flavor': 'ns uns',
+    'ropts': '--external macvlan[zdtmmvlan0]:zdtmbr0'}
diff --git a/test/zdtm/static/mnt_enablefs.desc b/test/zdtm/static/mnt_enablefs.desc
index eb5767a..33a78ed 100644
--- a/test/zdtm/static/mnt_enablefs.desc
+++ b/test/zdtm/static/mnt_enablefs.desc
@@ -1 +1,4 @@
-{'flavor': 'ns', 'feature': 'mnt_id', "flags": "suid", "opts" : "--enable-fs nfsd" }
+{   'feature': 'mnt_id',
+    'flags': 'suid',
+    'flavor': 'ns',
+    'opts': '--enable-fs nfsd'}
diff --git a/test/zdtm/static/mnt_ext_manual.desc b/test/zdtm/static/mnt_ext_manual.desc
index 50e0953..99e36d7 100644
--- a/test/zdtm/static/mnt_ext_manual.desc
+++ b/test/zdtm/static/mnt_ext_manual.desc
@@ -1 +1,4 @@
-{'flavor': 'ns uns', 'feature': 'mnt_id', 'dopts': '--external mnt[/zdtm/static/mnt_ext_manual.test]:ZDTM', 'ropts': '--external mnt[ZDTM]:/tmp/zdtm_ext_auto.XXXXXX/mtest'}
+{   'dopts': '--external mnt[/zdtm/static/mnt_ext_manual.test]:ZDTM',
+    'feature': 'mnt_id',
+    'flavor': 'ns uns',
+    'ropts': '--external mnt[ZDTM]:/tmp/zdtm_ext_auto.XXXXXX/mtest'}
diff --git a/test/zdtm/static/mnt_ext_master.desc b/test/zdtm/static/mnt_ext_master.desc
index 57d3787..3f00dcf 100644
--- a/test/zdtm/static/mnt_ext_master.desc
+++ b/test/zdtm/static/mnt_ext_master.desc
@@ -1 +1,3 @@
-{'flavor': 'ns uns', 'feature': 'mnt_id', 'opts': '--ext-mount-map auto --enable-external-masters'}
+{   'feature': 'mnt_id',
+    'flavor': 'ns uns',
+    'opts': '--ext-mount-map auto --enable-external-masters'}
diff --git a/test/zdtm/static/mnt_tracefs.desc b/test/zdtm/static/mnt_tracefs.desc
index 48ca743..e90ea94 100644
--- a/test/zdtm/static/mnt_tracefs.desc
+++ b/test/zdtm/static/mnt_tracefs.desc
@@ -1 +1,3 @@
-{'flavor': 'uns', 'feature': 'mnt_id', 'opts': '--ext-mount-map auto --enable-external-masters'}
+{   'feature': 'mnt_id',
+    'flavor': 'uns',
+    'opts': '--ext-mount-map auto --enable-external-masters'}
diff --git a/test/zdtm/static/netns-nf.desc b/test/zdtm/static/netns-nf.desc
index ca1684e..d1906c0 100644
--- a/test/zdtm/static/netns-nf.desc
+++ b/test/zdtm/static/netns-nf.desc
@@ -1 +1,6 @@
-{'flavor': 'ns uns', 'deps': [ '/bin/sh', '/sbin/iptables', '/usr/lib64/xtables/libxt_standard.so|/lib/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so', '/usr/bin/diff' ], 'flags': 'suid'}
+{   'deps': [   '/bin/sh',
+                '/sbin/iptables',
+                '/usr/lib64/xtables/libxt_standard.so|/lib/xtables/libxt_standard.so|/usr/lib/powerpc64le-linux-gnu/xtables/libxt_standard.so',
+                '/usr/bin/diff'],
+    'flags': 'suid',
+    'flavor': 'ns uns'}
diff --git a/test/zdtm/static/netns.desc b/test/zdtm/static/netns.desc
index d0b2c2c..202d9a0 100644
--- a/test/zdtm/static/netns.desc
+++ b/test/zdtm/static/netns.desc
@@ -1 +1,3 @@
-{'flavor': 'ns uns', 'deps': [ '/bin/sh', '/sbin/ip', '/usr/bin/diff'], 'flags': 'suid'}
+{   'deps': ['/bin/sh', '/sbin/ip', '/usr/bin/diff'],
+    'flags': 'suid',
+    'flavor': 'ns uns'}