TemporaryDirectoryTest Merge: Point tests to the Stout version of the `TemporaryDirectoryTest`.
We have two `TemporaryDirectoryTest` classes, which have almost identical contents. Note: The `LinuxFilesystemIsolatorTest` will be changed separately, as it requires some special cleanup. Review: https://reviews.apache.org/r/40000 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/2d066793 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/2d066793 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/2d066793 Branch: refs/heads/master Commit: 2d066793cc0dd060a7ca4a7d329d4da11c576adb Parents: c10391f Author: Joseph Wu <[email protected]> Authored: Fri Nov 6 16:14:52 2015 -0800 Committer: Jie Yu <[email protected]> Committed: Fri Nov 6 16:14:53 2015 -0800 ---------------------------------------------------------------------- src/tests/containerizer/fs_tests.cpp | 4 ++-- src/tests/containerizer/launch_tests.cpp | 3 ++- src/tests/containerizer/provisioner_appc_tests.cpp | 4 ++-- src/tests/containerizer/provisioner_backend_tests.cpp | 3 ++- src/tests/files_tests.cpp | 4 ++-- src/tests/log_tests.cpp | 3 ++- src/tests/protobuf_io_tests.cpp | 4 ++-- src/tests/registrar_tests.cpp | 6 ++---- src/tests/state_tests.cpp | 4 ++-- 9 files changed, 18 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/2d066793/src/tests/containerizer/fs_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/fs_tests.cpp b/src/tests/containerizer/fs_tests.cpp index 7fb4133..5f88d95 100644 --- a/src/tests/containerizer/fs_tests.cpp +++ b/src/tests/containerizer/fs_tests.cpp @@ -27,9 +27,9 @@ #include <stout/os.hpp> #include <stout/try.hpp> -#include "linux/fs.hpp" +#include <stout/tests/utils.hpp> -#include "tests/utils.hpp" +#include "linux/fs.hpp" using std::string; http://git-wip-us.apache.org/repos/asf/mesos/blob/2d066793/src/tests/containerizer/launch_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/launch_tests.cpp b/src/tests/containerizer/launch_tests.cpp index de655ec..79ceb5e 100644 --- a/src/tests/containerizer/launch_tests.cpp +++ b/src/tests/containerizer/launch_tests.cpp @@ -27,6 +27,8 @@ #include <stout/os.hpp> #include <stout/try.hpp> +#include <stout/tests/utils.hpp> + #include <process/gtest.hpp> #include <process/reap.hpp> #include <process/subprocess.hpp> @@ -34,7 +36,6 @@ #include "slave/containerizer/mesos/launch.hpp" #include "tests/flags.hpp" -#include "tests/utils.hpp" #include "tests/containerizer/rootfs.hpp" http://git-wip-us.apache.org/repos/asf/mesos/blob/2d066793/src/tests/containerizer/provisioner_appc_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/provisioner_appc_tests.cpp b/src/tests/containerizer/provisioner_appc_tests.cpp index 213e9c0..80dd752 100644 --- a/src/tests/containerizer/provisioner_appc_tests.cpp +++ b/src/tests/containerizer/provisioner_appc_tests.cpp @@ -29,6 +29,8 @@ #include <stout/stringify.hpp> #include <stout/uuid.hpp> +#include <stout/tests/utils.hpp> + #include "slave/paths.hpp" #include "slave/containerizer/mesos/provisioner/paths.hpp" @@ -37,8 +39,6 @@ #include "slave/containerizer/mesos/provisioner/appc/spec.hpp" #include "slave/containerizer/mesos/provisioner/appc/store.hpp" -#include "tests/utils.hpp" - using std::list; using std::string; using std::vector; http://git-wip-us.apache.org/repos/asf/mesos/blob/2d066793/src/tests/containerizer/provisioner_backend_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/provisioner_backend_tests.cpp b/src/tests/containerizer/provisioner_backend_tests.cpp index 3347d58..1b14659 100644 --- a/src/tests/containerizer/provisioner_backend_tests.cpp +++ b/src/tests/containerizer/provisioner_backend_tests.cpp @@ -25,6 +25,8 @@ #include <stout/path.hpp> #include <stout/strings.hpp> +#include <stout/tests/utils.hpp> + #ifdef __linux__ #include "linux/fs.hpp" #endif // __linux__ @@ -33,7 +35,6 @@ #include "slave/containerizer/mesos/provisioner/backends/copy.hpp" #include "tests/flags.hpp" -#include "tests/utils.hpp" using namespace process; http://git-wip-us.apache.org/repos/asf/mesos/blob/2d066793/src/tests/files_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/files_tests.cpp b/src/tests/files_tests.cpp index 4b13f5b..4e66917 100644 --- a/src/tests/files_tests.cpp +++ b/src/tests/files_tests.cpp @@ -31,9 +31,9 @@ #include <stout/os.hpp> #include <stout/stringify.hpp> -#include "files/files.hpp" +#include <stout/tests/utils.hpp> -#include "tests/utils.hpp" +#include "files/files.hpp" using process::Future; http://git-wip-us.apache.org/repos/asf/mesos/blob/2d066793/src/tests/log_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/log_tests.cpp b/src/tests/log_tests.cpp index bbf7a7e..4ff7a6a 100644 --- a/src/tests/log_tests.cpp +++ b/src/tests/log_tests.cpp @@ -42,6 +42,8 @@ #include <stout/stopwatch.hpp> #include <stout/try.hpp> +#include <stout/tests/utils.hpp> + #include "log/catchup.hpp" #include "log/coordinator.hpp" #include "log/leveldb.hpp" @@ -53,7 +55,6 @@ #include "log/tool/initialize.hpp" #include "tests/environment.hpp" -#include "tests/utils.hpp" #ifdef MESOS_HAS_JAVA #include "tests/zookeeper.hpp" http://git-wip-us.apache.org/repos/asf/mesos/blob/2d066793/src/tests/protobuf_io_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/protobuf_io_tests.cpp b/src/tests/protobuf_io_tests.cpp index f5e041c..61146ed 100644 --- a/src/tests/protobuf_io_tests.cpp +++ b/src/tests/protobuf_io_tests.cpp @@ -28,9 +28,9 @@ #include <stout/protobuf.hpp> #include <stout/result.hpp> -#include "messages/messages.hpp" +#include <stout/tests/utils.hpp> -#include "tests/utils.hpp" +#include "messages/messages.hpp" using std::string; http://git-wip-us.apache.org/repos/asf/mesos/blob/2d066793/src/tests/registrar_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/registrar_tests.cpp b/src/tests/registrar_tests.cpp index 2610a56..f4ed01e 100644 --- a/src/tests/registrar_tests.cpp +++ b/src/tests/registrar_tests.cpp @@ -36,6 +36,8 @@ #include <stout/stopwatch.hpp> #include <stout/uuid.hpp> +#include <stout/tests/utils.hpp> + #include "common/protobuf_utils.hpp" #include "log/log.hpp" @@ -54,8 +56,6 @@ #include "state/protobuf.hpp" #include "state/storage.hpp" -#include "tests/utils.hpp" - using namespace mesos::internal::master; using namespace process; @@ -84,8 +84,6 @@ using testing::DoAll; using testing::Eq; using testing::Return; -using mesos::internal::tests::TemporaryDirectoryTest; - using ::testing::WithParamInterface; namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/2d066793/src/tests/state_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/state_tests.cpp b/src/tests/state_tests.cpp index b8cddc5..7cee17d 100644 --- a/src/tests/state_tests.cpp +++ b/src/tests/state_tests.cpp @@ -34,9 +34,10 @@ #include <stout/gtest.hpp> #include <stout/option.hpp> #include <stout/os.hpp> +#include <stout/protobuf.hpp> #include <stout/try.hpp> -#include <stout/protobuf.hpp> +#include <stout/tests/utils.hpp> #include "log/log.hpp" #include "log/replica.hpp" @@ -54,7 +55,6 @@ #include "state/storage.hpp" #include "state/zookeeper.hpp" -#include "tests/utils.hpp" #ifdef MESOS_HAS_JAVA #include "tests/zookeeper.hpp" #endif
