mesos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From qianzh...@apache.org
Subject mesos git commit: Surrounded raw string with `string()` for `DefaultContainerDNSCniTest`.
Date Thu, 03 Aug 2017 11:33:01 GMT
Repository: mesos
Updated Branches:
  refs/heads/master 01e5bc386 -> 9b0c836cd


Surrounded raw string with `string()` for `DefaultContainerDNSCniTest`.


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9b0c836c
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9b0c836c
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9b0c836c

Branch: refs/heads/master
Commit: 9b0c836cd7fbf239788e8959ae10620caa7fd8a2
Parents: 01e5bc3
Author: Qian Zhang <zhq527725@gmail.com>
Authored: Thu Aug 3 19:29:45 2017 +0800
Committer: Qian Zhang <zhq527725@gmail.com>
Committed: Thu Aug 3 19:29:45 2017 +0800

----------------------------------------------------------------------
 src/tests/containerizer/cni_isolator_tests.cpp | 102 ++++++++++----------
 1 file changed, 52 insertions(+), 50 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/9b0c836c/src/tests/containerizer/cni_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/cni_isolator_tests.cpp b/src/tests/containerizer/cni_isolator_tests.cpp
index 0a16294..baaed8c 100644
--- a/src/tests/containerizer/cni_isolator_tests.cpp
+++ b/src/tests/containerizer/cni_isolator_tests.cpp
@@ -1743,65 +1743,67 @@ INSTANTIATE_TEST_CASE_P(
     DefaultContainerDNSCniTest,
     ::testing::Values(
         // A DNS information for the `__MESOS_TEST__` CNI network.
-        R"~(
-        {
-          "mesos": [
+        string(
+            R"~(
             {
-              "network_mode": "CNI",
-              "network_name": "__MESOS_TEST__",
-              "dns": {
-                "nameservers": [ "8.8.8.8", "8.8.4.4" ],
-                "domain": "mesos.apache.org",
-                "search": [ "a.mesos.apache.org", "a.mesos.apache.org" ],
-                "options": [ "timeout:3", "attempts:2" ]
-              }
-            }
-          ]
-        })~",
+              "mesos": [
+                {
+                  "network_mode": "CNI",
+                  "network_name": "__MESOS_TEST__",
+                  "dns": {
+                    "nameservers": [ "8.8.8.8", "8.8.4.4" ],
+                    "domain": "mesos.apache.org",
+                    "search": [ "a.mesos.apache.org", "a.mesos.apache.org" ],
+                    "options": [ "timeout:3", "attempts:2" ]
+                  }
+                }
+              ]
+            })~"),
         // A DNS information with `network_mode == CNI`, but without a network
         // name, acts as a wildcard match making it the default DNS for any CNI
         // network not specified in the `--default_container_dns` flag.
-        R"~(
-        {
-          "mesos": [
+        string(
+            R"~(
             {
-              "network_mode": "CNI",
-              "dns": {
-                "nameservers": [ "8.8.8.8", "8.8.4.4" ],
-                "domain": "mesos.apache.org",
-                "search": [ "a.mesos.apache.org", "a.mesos.apache.org" ],
-                "options": [ "timeout:3", "attempts:2" ]
-              }
-            }
-          ]
-        })~",
+              "mesos": [
+                {
+                  "network_mode": "CNI",
+                  "dns": {
+                    "nameservers": [ "8.8.8.8", "8.8.4.4" ],
+                    "domain": "mesos.apache.org",
+                    "search": [ "a.mesos.apache.org", "a.mesos.apache.org" ],
+                    "options": [ "timeout:3", "attempts:2" ]
+                  }
+                }
+              ]
+            })~"),
         // Two DNS information, one is specific for `__MESOS_TEST__` CNI
         // network, the other is the defaule DNS for any CNI network not
         // specified in the `--default_container_dns` flag.
-        R"~(
-        {
-          "mesos": [
-            {
-              "network_mode": "CNI",
-              "network_name": "__MESOS_TEST__",
-              "dns": {
-                "nameservers": [ "8.8.8.8", "8.8.4.4" ],
-                "domain": "mesos.apache.org",
-                "search": [ "a.mesos.apache.org", "a.mesos.apache.org" ],
-                "options": [ "timeout:3", "attempts:2" ]
-              }
-            },
+        string(
+            R"~(
             {
-              "network_mode": "CNI",
-              "dns": {
-                "nameservers": [ "8.8.8.9", "8.8.4.5" ],
-                "domain": "mesos1.apache.org",
-                "search": [ "b.mesos.apache.org", "b.mesos.apache.org" ],
-                "options": [ "timeout:9", "attempts:5" ]
-              }
-            }
-          ]
-        })~"));
+              "mesos": [
+                {
+                  "network_mode": "CNI",
+                  "network_name": "__MESOS_TEST__",
+                  "dns": {
+                    "nameservers": [ "8.8.8.8", "8.8.4.4" ],
+                    "domain": "mesos.apache.org",
+                    "search": [ "a.mesos.apache.org", "a.mesos.apache.org" ],
+                    "options": [ "timeout:3", "attempts:2" ]
+                  }
+                },
+                {
+                  "network_mode": "CNI",
+                  "dns": {
+                    "nameservers": [ "8.8.8.9", "8.8.4.5" ],
+                    "domain": "mesos1.apache.org",
+                    "search": [ "b.mesos.apache.org", "b.mesos.apache.org" ],
+                    "options": [ "timeout:9", "attempts:5" ]
+                  }
+                }
+              ]})~")));
 
 
 // This test verifies the DNS configuration of the container can be


Mime
View raw message