Repository: mesos Updated Branches: refs/heads/master beb685b95 -> 13cae29e7
Updated a test subtly dependent on implementation-defined behavior. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/13cae29e Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/13cae29e Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/13cae29e Branch: refs/heads/master Commit: 13cae29e7832d8bb879c68847ad0df449d227f17 Parents: d2e2656 Author: Michael Park <mcyp...@gmail.com> Authored: Tue Jun 13 13:06:51 2017 -0700 Committer: Michael Park <mcyp...@gmail.com> Committed: Tue Jun 13 15:34:17 2017 -0700 ---------------------------------------------------------------------- src/tests/persistent_volume_endpoints_tests.cpp | 94 ++++++++++---------- 1 file changed, 47 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/13cae29e/src/tests/persistent_volume_endpoints_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/persistent_volume_endpoints_tests.cpp b/src/tests/persistent_volume_endpoints_tests.cpp index 80501e6..0cb969c 100644 --- a/src/tests/persistent_volume_endpoints_tests.cpp +++ b/src/tests/persistent_volume_endpoints_tests.cpp @@ -2162,23 +2162,10 @@ TEST_F(PersistentVolumeEndpointsTest, SlavesEndpointFullResources) "allocation_info": { "role": "role1" }, - "disk": { - "persistence": { - "id": "id1", - "principal": "test-principal" - }, - "volume": { - "container_path": "path1", - "mode": "RW" - } - }, - "name": "disk", - "reservation": { - "principal": "test-principal" - }, - "role": "role1", + "name": "cpus", + "role": "*", "scalar": { - "value": 64.0 + "value": 3.0 }, "type": "SCALAR" }, @@ -2187,12 +2174,9 @@ TEST_F(PersistentVolumeEndpointsTest, SlavesEndpointFullResources) "role": "role1" }, "name": "mem", - "reservation": { - "principal": "test-principal" - }, - "role": "role1", + "role": "*", "scalar": { - "value": 256.0 + "value": 1536.0 }, "type": "SCALAR" }, @@ -2201,12 +2185,9 @@ TEST_F(PersistentVolumeEndpointsTest, SlavesEndpointFullResources) "role": "role1" }, "name": "disk", - "reservation": { - "principal": "test-principal" - }, - "role": "role1", + "role": "*", "scalar": { - "value": 960.0 + "value": 3072.0 }, "type": "SCALAR" }, @@ -2214,21 +2195,39 @@ TEST_F(PersistentVolumeEndpointsTest, SlavesEndpointFullResources) "allocation_info": { "role": "role1" }, - "name": "cpus", - "role": "*", - "scalar": { - "value": 3.0 + "name": "ports", + "ranges": { + "range": [ + { + "begin": 31000, + "end": 32000 + } + ] }, - "type": "SCALAR" + "role": "*", + "type": "RANGES" }, { "allocation_info": { "role": "role1" }, - "name": "mem", - "role": "*", + "disk": { + "persistence": { + "id": "id1", + "principal": "test-principal" + }, + "volume": { + "container_path": "path1", + "mode": "RW" + } + }, + "name": "disk", + "reservation": { + "principal": "test-principal" + }, + "role": "role1", "scalar": { - "value": 1536.0 + "value": 64.0 }, "type": "SCALAR" }, @@ -2236,10 +2235,13 @@ TEST_F(PersistentVolumeEndpointsTest, SlavesEndpointFullResources) "allocation_info": { "role": "role1" }, - "name": "disk", - "role": "*", + "name": "mem", + "reservation": { + "principal": "test-principal" + }, + "role": "role1", "scalar": { - "value": 3072.0 + "value": 256.0 }, "type": "SCALAR" }, @@ -2247,17 +2249,15 @@ TEST_F(PersistentVolumeEndpointsTest, SlavesEndpointFullResources) "allocation_info": { "role": "role1" }, - "name": "ports", - "ranges": { - "range": [ - { - "begin": 31000, - "end": 32000 - } - ] + "name": "disk", + "reservation": { + "principal": "test-principal" }, - "role": "*", - "type": "RANGES" + "role": "role1", + "scalar": { + "value": 960.0 + }, + "type": "SCALAR" } ])~");
