mesos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ji...@apache.org
Subject [01/17] mesos git commit: Renamed `CGROUPS_ROOT_PERF_RollForward` to keep consistency.
Date Tue, 13 Sep 2016 17:54:27 GMT
Repository: mesos
Updated Branches:
  refs/heads/master f833169b4 -> 8e727e091


Renamed `CGROUPS_ROOT_PERF_RollForward` to keep consistency.

Review: https://reviews.apache.org/r/51791/


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

Branch: refs/heads/master
Commit: 8e727e09141fa569487b557cd8a1f8e388366dcb
Parents: 08594c2
Author: haosdent huang <haosdent@gmail.com>
Authored: Mon Sep 12 16:35:17 2016 -0700
Committer: Jie Yu <yujie.jay@gmail.com>
Committed: Tue Sep 13 10:52:01 2016 -0700

----------------------------------------------------------------------
 src/tests/environment.cpp          | 3 +--
 src/tests/slave_recovery_tests.cpp | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/8e727e09/src/tests/environment.cpp
----------------------------------------------------------------------
diff --git a/src/tests/environment.cpp b/src/tests/environment.cpp
index 57ec492..fba94f6 100644
--- a/src/tests/environment.cpp
+++ b/src/tests/environment.cpp
@@ -590,9 +590,8 @@ public:
   {
     // Disable all tests that try to sample 'cpu-cycles' events using 'perf'.
     return (matches(test, "ROOT_CGROUPS_PERF_PerfTest") ||
-            matches(test, "ROOT_CGROUPS_PERF_Sample") ||
             matches(test, "ROOT_CGROUPS_PERF_UserCgroup") ||
-            matches(test, "CGROUPS_ROOT_PERF_RollForward") ||
+            matches(test, "ROOT_CGROUPS_PERF_RollForward") ||
             matches(test, "ROOT_CGROUPS_PERF_Sample")) && perfError.isSome();
   }
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/8e727e09/src/tests/slave_recovery_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp
index 3c69e56..d58d9bc 100644
--- a/src/tests/slave_recovery_tests.cpp
+++ b/src/tests/slave_recovery_tests.cpp
@@ -3878,7 +3878,7 @@ TEST_F(MesosContainerizerSlaveRecoveryTest, ResourceStatistics)
 // Test that the perf event isolator can be enabled on a new slave.
 // Previously created containers will not report perf statistics but
 // newly created containers will.
-TEST_F(MesosContainerizerSlaveRecoveryTest, CGROUPS_ROOT_PERF_RollForward)
+TEST_F(MesosContainerizerSlaveRecoveryTest, ROOT_CGROUPS_PERF_RollForward)
 {
   Try<Owned<cluster::Master>> master = this->StartMaster();
   ASSERT_SOME(master);


Mime
View raw message