diff options
| -rw-r--r-- | common/test_utils.h | 21 | ||||
| -rw-r--r-- | p2p_manager_unittest.cc | 1 | ||||
| -rw-r--r-- | payload_consumer/postinstall_runner_action_unittest.cc | 1 |
3 files changed, 3 insertions, 20 deletions
diff --git a/common/test_utils.h b/common/test_utils.h index ffe6f670..5be48cf4 100644 --- a/common/test_utils.h +++ b/common/test_utils.h @@ -24,18 +24,15 @@ // Streams used for gtest's PrintTo() functions. #include <iostream> // NOLINT(readability/streams) #include <memory> -#include <set> #include <string> #include <vector> -#include <base/callback.h> #include <base/files/file_path.h> #include <base/files/scoped_temp_dir.h> #include <gmock/gmock.h> #include <gtest/gtest.h> #include "update_engine/common/action.h" -#include "update_engine/common/subprocess.h" #include "update_engine/common/utils.h" #include "update_engine/update_metadata.pb.h" @@ -76,22 +73,6 @@ inline int System(const std::string& cmd) { return system(cmd.c_str()); } -inline int Symlink(const std::string& oldpath, const std::string& newpath) { - return symlink(oldpath.c_str(), newpath.c_str()); -} - -inline int Chmod(const std::string& path, mode_t mode) { - return chmod(path.c_str(), mode); -} - -inline int Mkdir(const std::string& path, mode_t mode) { - return mkdir(path.c_str(), mode); -} - -inline int Chdir(const std::string& path) { - return chdir(path.c_str()); -} - // Reads a symlink from disk. Returns empty string on failure. std::string Readlink(const std::string& path); @@ -144,7 +125,7 @@ class ScopedLoopbackDeviceBinder { ADD_FAILURE(); } - const std::string &dev() { + const std::string& dev() const { EXPECT_TRUE(is_bound_); return dev_; } diff --git a/p2p_manager_unittest.cc b/p2p_manager_unittest.cc index 02fd17bf..736a87a7 100644 --- a/p2p_manager_unittest.cc +++ b/p2p_manager_unittest.cc @@ -43,6 +43,7 @@ #include "update_engine/common/fake_clock.h" #include "update_engine/common/prefs.h" +#include "update_engine/common/subprocess.h" #include "update_engine/common/test_utils.h" #include "update_engine/common/utils.h" #include "update_engine/fake_p2p_manager_configuration.h" diff --git a/payload_consumer/postinstall_runner_action_unittest.cc b/payload_consumer/postinstall_runner_action_unittest.cc index 83814725..8d461d52 100644 --- a/payload_consumer/postinstall_runner_action_unittest.cc +++ b/payload_consumer/postinstall_runner_action_unittest.cc @@ -37,6 +37,7 @@ #include "update_engine/common/constants.h" #include "update_engine/common/fake_boot_control.h" #include "update_engine/common/fake_hardware.h" +#include "update_engine/common/subprocess.h" #include "update_engine/common/test_utils.h" #include "update_engine/common/utils.h" #include "update_engine/mock_payload_state.h" |