]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
test: Replace tabs with spaces in virnetdaemondata json files
authorErik Skultety <eskultet@redhat.com>
Thu, 6 Aug 2015 13:33:58 +0000 (15:33 +0200)
committerErik Skultety <eskultet@redhat.com>
Mon, 24 Aug 2015 07:30:40 +0000 (09:30 +0200)
JSON data that are used to initialize tests in virnetdaemontest should
be in a consistent format, i.e. not using tabs for indentation, those
should be replaced by spaces.

tests/virnetdaemondata/input-data-admin-nomdns.json
tests/virnetdaemondata/input-data-no-keepalive-required.json
tests/virnetdaemondata/output-data-no-keepalive-required.json

index 59bc4714a60b55520bac6fd494b7d05c002b1b54..449bcc9b259c25b94b84c166aa3991a57b919223 100644 (file)
 {
     "servers": [
-       {
-           "min_workers": 10,
-           "max_workers": 50,
-           "priority_workers": 5,
-           "max_clients": 100,
-           "keepaliveInterval": 120,
-           "keepaliveCount": 5,
-           "keepaliveRequired": true,
-           "services": [
-               {
-                   "auth": 0,
-                   "readonly": true,
-                   "nrequests_client_max": 2,
-                   "socks": [
-                       {
-                           "fd": 100,
-                           "errfd": -1,
-                           "pid": 0,
-                           "isClient": false
-                       }
-                   ]
-               },
-               {
-                   "auth": 2,
-                   "readonly": false,
-                   "nrequests_client_max": 5,
-                   "socks": [
-                       {
-                           "fd": 101,
-                           "errfd": -1,
-                           "pid": 0,
-                           "isClient": false
-                       }
-                   ]
-               }
-           ],
-           "clients": [
-               {
-                   "auth": 1,
-                   "readonly": true,
-                   "nrequests_max": 15,
-                   "sock": {
-                       "fd": 102,
-                       "errfd": -1,
-                       "pid": -1,
-                       "isClient": true
-                   }
-               },
-               {
-                   "auth": 2,
-                   "readonly": true,
-                   "nrequests_max": 66,
-                   "sock": {
-                       "fd": 103,
-                       "errfd": -1,
-                       "pid": -1,
-                       "isClient": true
-                   }
-               }
-           ]
-       },
-       {
-           "min_workers": 2,
-           "max_workers": 50,
-           "priority_workers": 5,
-           "max_clients": 100,
-           "keepaliveInterval": 120,
-           "keepaliveCount": 5,
-           "keepaliveRequired": true,
-           "services": [
-               {
-                   "auth": 0,
-                   "readonly": true,
-                   "nrequests_client_max": 2,
-                   "socks": [
-                       {
-                           "fd": 100,
-                           "errfd": -1,
-                           "pid": 0,
-                           "isClient": false
-                       }
-                   ]
-               },
-               {
-                   "auth": 2,
-                   "readonly": false,
-                   "nrequests_client_max": 5,
-                   "socks": [
-                       {
-                           "fd": 101,
-                           "errfd": -1,
-                           "pid": 0,
-                           "isClient": false
-                       }
-                   ]
-               }
-           ],
-           "clients": [
-               {
-                   "auth": 1,
-                   "readonly": true,
-                   "nrequests_max": 15,
-                   "sock": {
-                       "fd": 102,
-                       "errfd": -1,
-                       "pid": -1,
-                       "isClient": true
-                   }
-               },
-               {
-                   "auth": 2,
-                   "readonly": true,
-                   "nrequests_max": 66,
-                   "sock": {
-                       "fd": 103,
-                       "errfd": -1,
-                       "pid": -1,
-                       "isClient": true
-                   }
-               }
-           ]
-       }
+    {
+        "min_workers": 10,
+        "max_workers": 50,
+        "priority_workers": 5,
+        "max_clients": 100,
+        "keepaliveInterval": 120,
+        "keepaliveCount": 5,
+        "keepaliveRequired": true,
+        "services": [
+        {
+            "auth": 0,
+            "readonly": true,
+            "nrequests_client_max": 2,
+            "socks": [
+            {
+                "fd": 100,
+                "errfd": -1,
+                "pid": 0,
+                "isClient": false
+            }
+            ]
+        },
+        {
+            "auth": 2,
+            "readonly": false,
+            "nrequests_client_max": 5,
+            "socks": [
+            {
+                "fd": 101,
+                "errfd": -1,
+                "pid": 0,
+                "isClient": false
+            }
+            ]
+        }
+        ],
+        "clients": [
+        {
+            "auth": 1,
+            "readonly": true,
+            "nrequests_max": 15,
+            "sock": {
+            "fd": 102,
+            "errfd": -1,
+            "pid": -1,
+            "isClient": true
+            }
+        },
+        {
+            "auth": 2,
+            "readonly": true,
+            "nrequests_max": 66,
+            "sock": {
+            "fd": 103,
+            "errfd": -1,
+            "pid": -1,
+            "isClient": true
+            }
+        }
+        ]
+    },
+    {
+        "min_workers": 2,
+        "max_workers": 50,
+        "priority_workers": 5,
+        "max_clients": 100,
+        "keepaliveInterval": 120,
+        "keepaliveCount": 5,
+        "keepaliveRequired": true,
+        "services": [
+        {
+            "auth": 0,
+            "readonly": true,
+            "nrequests_client_max": 2,
+            "socks": [
+            {
+                "fd": 100,
+                "errfd": -1,
+                "pid": 0,
+                "isClient": false
+            }
+            ]
+        },
+        {
+            "auth": 2,
+            "readonly": false,
+            "nrequests_client_max": 5,
+            "socks": [
+            {
+                "fd": 101,
+                "errfd": -1,
+                "pid": 0,
+                "isClient": false
+            }
+            ]
+        }
+        ],
+        "clients": [
+        {
+            "auth": 1,
+            "readonly": true,
+            "nrequests_max": 15,
+            "sock": {
+            "fd": 102,
+            "errfd": -1,
+            "pid": -1,
+            "isClient": true
+            }
+        },
+        {
+            "auth": 2,
+            "readonly": true,
+            "nrequests_max": 66,
+            "sock": {
+            "fd": 103,
+            "errfd": -1,
+            "pid": -1,
+            "isClient": true
+            }
+        }
+        ]
+    }
     ]
 }
index b5e4dc8e03913225fb53b2458c23cac092659fb5..df282edd6ef8575fb7957343557c7fea1a0843a1 100644 (file)
 {
     "servers": [
-       {
-           "min_workers": 10,
-           "max_workers": 50,
-           "priority_workers": 5,
-           "max_clients": 100,
-           "keepaliveInterval": 120,
-           "keepaliveCount": 5,
-           "services": [
-               {
-                   "auth": 0,
-                   "readonly": true,
-                   "nrequests_client_max": 2,
-                   "socks": [
-                       {
-                           "fd": 100,
-                           "errfd": -1,
-                           "pid": 0,
-                           "isClient": false
-                       }
-                   ]
-               },
-               {
-                   "auth": 2,
-                   "readonly": false,
-                   "nrequests_client_max": 5,
-                   "socks": [
-                       {
-                           "fd": 101,
-                           "errfd": -1,
-                           "pid": 0,
-                           "isClient": false
-                       }
-                   ]
-               }
-           ],
-           "clients": [
-               {
-                   "auth": 1,
-                   "readonly": true,
-                   "nrequests_max": 15,
-                   "sock": {
-                       "fd": 102,
-                       "errfd": -1,
-                       "pid": -1,
-                       "isClient": true
-                   }
-               },
-               {
-                   "auth": 2,
-                   "readonly": true,
-                   "nrequests_max": 66,
-                   "sock": {
-                       "fd": 103,
-                       "errfd": -1,
-                       "pid": -1,
-                       "isClient": true
-                   }
-               }
-           ]
-       },
-       {
-           "min_workers": 2,
-           "max_workers": 50,
-           "priority_workers": 5,
-           "max_clients": 100,
-           "keepaliveInterval": 120,
-           "keepaliveCount": 5,
-           "services": [
-               {
-                   "auth": 0,
-                   "readonly": true,
-                   "nrequests_client_max": 2,
-                   "socks": [
-                       {
-                           "fd": 100,
-                           "errfd": -1,
-                           "pid": 0,
-                           "isClient": false
-                       }
-                   ]
-               },
-               {
-                   "auth": 2,
-                   "readonly": false,
-                   "nrequests_client_max": 5,
-                   "socks": [
-                       {
-                           "fd": 101,
-                           "errfd": -1,
-                           "pid": 0,
-                           "isClient": false
-                       }
-                   ]
-               }
-           ],
-           "clients": [
-               {
-                   "auth": 1,
-                   "readonly": true,
-                   "nrequests_max": 15,
-                   "sock": {
-                       "fd": 102,
-                       "errfd": -1,
-                       "pid": -1,
-                       "isClient": true
-                   }
-               },
-               {
-                   "auth": 2,
-                   "readonly": true,
-                   "nrequests_max": 66,
-                   "sock": {
-                       "fd": 103,
-                       "errfd": -1,
-                       "pid": -1,
-                       "isClient": true
-                   }
-               }
-           ]
-       }
+    {
+        "min_workers": 10,
+        "max_workers": 50,
+        "priority_workers": 5,
+        "max_clients": 100,
+        "keepaliveInterval": 120,
+        "keepaliveCount": 5,
+        "services": [
+        {
+            "auth": 0,
+            "readonly": true,
+            "nrequests_client_max": 2,
+            "socks": [
+            {
+                "fd": 100,
+                "errfd": -1,
+                "pid": 0,
+                "isClient": false
+            }
+            ]
+        },
+        {
+            "auth": 2,
+            "readonly": false,
+            "nrequests_client_max": 5,
+            "socks": [
+            {
+                "fd": 101,
+                "errfd": -1,
+                "pid": 0,
+                "isClient": false
+            }
+            ]
+        }
+        ],
+        "clients": [
+        {
+            "auth": 1,
+            "readonly": true,
+            "nrequests_max": 15,
+            "sock": {
+            "fd": 102,
+            "errfd": -1,
+            "pid": -1,
+            "isClient": true
+            }
+        },
+        {
+            "auth": 2,
+            "readonly": true,
+            "nrequests_max": 66,
+            "sock": {
+            "fd": 103,
+            "errfd": -1,
+            "pid": -1,
+            "isClient": true
+            }
+        }
+        ]
+    },
+    {
+        "min_workers": 2,
+        "max_workers": 50,
+        "priority_workers": 5,
+        "max_clients": 100,
+        "keepaliveInterval": 120,
+        "keepaliveCount": 5,
+        "services": [
+        {
+            "auth": 0,
+            "readonly": true,
+            "nrequests_client_max": 2,
+            "socks": [
+            {
+                "fd": 100,
+                "errfd": -1,
+                "pid": 0,
+                "isClient": false
+            }
+            ]
+        },
+        {
+            "auth": 2,
+            "readonly": false,
+            "nrequests_client_max": 5,
+            "socks": [
+            {
+                "fd": 101,
+                "errfd": -1,
+                "pid": 0,
+                "isClient": false
+            }
+            ]
+        }
+        ],
+        "clients": [
+        {
+            "auth": 1,
+            "readonly": true,
+            "nrequests_max": 15,
+            "sock": {
+            "fd": 102,
+            "errfd": -1,
+            "pid": -1,
+            "isClient": true
+            }
+        },
+        {
+            "auth": 2,
+            "readonly": true,
+            "nrequests_max": 66,
+            "sock": {
+            "fd": 103,
+            "errfd": -1,
+            "pid": -1,
+            "isClient": true
+            }
+        }
+        ]
+    }
     ]
 }
index b5e4dc8e03913225fb53b2458c23cac092659fb5..df282edd6ef8575fb7957343557c7fea1a0843a1 100644 (file)
 {
     "servers": [
-       {
-           "min_workers": 10,
-           "max_workers": 50,
-           "priority_workers": 5,
-           "max_clients": 100,
-           "keepaliveInterval": 120,
-           "keepaliveCount": 5,
-           "services": [
-               {
-                   "auth": 0,
-                   "readonly": true,
-                   "nrequests_client_max": 2,
-                   "socks": [
-                       {
-                           "fd": 100,
-                           "errfd": -1,
-                           "pid": 0,
-                           "isClient": false
-                       }
-                   ]
-               },
-               {
-                   "auth": 2,
-                   "readonly": false,
-                   "nrequests_client_max": 5,
-                   "socks": [
-                       {
-                           "fd": 101,
-                           "errfd": -1,
-                           "pid": 0,
-                           "isClient": false
-                       }
-                   ]
-               }
-           ],
-           "clients": [
-               {
-                   "auth": 1,
-                   "readonly": true,
-                   "nrequests_max": 15,
-                   "sock": {
-                       "fd": 102,
-                       "errfd": -1,
-                       "pid": -1,
-                       "isClient": true
-                   }
-               },
-               {
-                   "auth": 2,
-                   "readonly": true,
-                   "nrequests_max": 66,
-                   "sock": {
-                       "fd": 103,
-                       "errfd": -1,
-                       "pid": -1,
-                       "isClient": true
-                   }
-               }
-           ]
-       },
-       {
-           "min_workers": 2,
-           "max_workers": 50,
-           "priority_workers": 5,
-           "max_clients": 100,
-           "keepaliveInterval": 120,
-           "keepaliveCount": 5,
-           "services": [
-               {
-                   "auth": 0,
-                   "readonly": true,
-                   "nrequests_client_max": 2,
-                   "socks": [
-                       {
-                           "fd": 100,
-                           "errfd": -1,
-                           "pid": 0,
-                           "isClient": false
-                       }
-                   ]
-               },
-               {
-                   "auth": 2,
-                   "readonly": false,
-                   "nrequests_client_max": 5,
-                   "socks": [
-                       {
-                           "fd": 101,
-                           "errfd": -1,
-                           "pid": 0,
-                           "isClient": false
-                       }
-                   ]
-               }
-           ],
-           "clients": [
-               {
-                   "auth": 1,
-                   "readonly": true,
-                   "nrequests_max": 15,
-                   "sock": {
-                       "fd": 102,
-                       "errfd": -1,
-                       "pid": -1,
-                       "isClient": true
-                   }
-               },
-               {
-                   "auth": 2,
-                   "readonly": true,
-                   "nrequests_max": 66,
-                   "sock": {
-                       "fd": 103,
-                       "errfd": -1,
-                       "pid": -1,
-                       "isClient": true
-                   }
-               }
-           ]
-       }
+    {
+        "min_workers": 10,
+        "max_workers": 50,
+        "priority_workers": 5,
+        "max_clients": 100,
+        "keepaliveInterval": 120,
+        "keepaliveCount": 5,
+        "services": [
+        {
+            "auth": 0,
+            "readonly": true,
+            "nrequests_client_max": 2,
+            "socks": [
+            {
+                "fd": 100,
+                "errfd": -1,
+                "pid": 0,
+                "isClient": false
+            }
+            ]
+        },
+        {
+            "auth": 2,
+            "readonly": false,
+            "nrequests_client_max": 5,
+            "socks": [
+            {
+                "fd": 101,
+                "errfd": -1,
+                "pid": 0,
+                "isClient": false
+            }
+            ]
+        }
+        ],
+        "clients": [
+        {
+            "auth": 1,
+            "readonly": true,
+            "nrequests_max": 15,
+            "sock": {
+            "fd": 102,
+            "errfd": -1,
+            "pid": -1,
+            "isClient": true
+            }
+        },
+        {
+            "auth": 2,
+            "readonly": true,
+            "nrequests_max": 66,
+            "sock": {
+            "fd": 103,
+            "errfd": -1,
+            "pid": -1,
+            "isClient": true
+            }
+        }
+        ]
+    },
+    {
+        "min_workers": 2,
+        "max_workers": 50,
+        "priority_workers": 5,
+        "max_clients": 100,
+        "keepaliveInterval": 120,
+        "keepaliveCount": 5,
+        "services": [
+        {
+            "auth": 0,
+            "readonly": true,
+            "nrequests_client_max": 2,
+            "socks": [
+            {
+                "fd": 100,
+                "errfd": -1,
+                "pid": 0,
+                "isClient": false
+            }
+            ]
+        },
+        {
+            "auth": 2,
+            "readonly": false,
+            "nrequests_client_max": 5,
+            "socks": [
+            {
+                "fd": 101,
+                "errfd": -1,
+                "pid": 0,
+                "isClient": false
+            }
+            ]
+        }
+        ],
+        "clients": [
+        {
+            "auth": 1,
+            "readonly": true,
+            "nrequests_max": 15,
+            "sock": {
+            "fd": 102,
+            "errfd": -1,
+            "pid": -1,
+            "isClient": true
+            }
+        },
+        {
+            "auth": 2,
+            "readonly": true,
+            "nrequests_max": 66,
+            "sock": {
+            "fd": 103,
+            "errfd": -1,
+            "pid": -1,
+            "isClient": true
+            }
+        }
+        ]
+    }
     ]
 }