tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Move TempDevice to test_util.h"

Browse source 
am: 30820a384c

Change-Id: Ie6fdce86c133bf54f8bce79593d8fbe3d9ead914
This commit is contained in:
Alessio Balsini 2019-10-11 03:38:40 -07:00 committed by android-build-merger
commit 66568bf4b0
2 changed files with 48 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
fs_mgr/libdm/dm_test.cpp
View file

@ -47,50 +47,6 @@ TEST(libdm, HasMinimumTargets) {
ASSERT_TRUE(dm.GetTargetByName("linear", &info));
}
// Helper to ensure that device mapper devices are released.
class TempDevice {
public:
TempDevice(const std::string& name, const DmTable& table)
: dm_(DeviceMapper::Instance()), name_(name), valid_(false) {
valid_ = dm_.CreateDevice(name, table, &path_, 5s);
}
TempDevice(TempDevice&& other) noexcept
: dm_(other.dm_), name_(other.name_), path_(other.path_), valid_(other.valid_) {
other.valid_ = false;
}
~TempDevice() {
if (valid_) {
dm_.DeleteDevice(name_);
}
}
bool Destroy() {
if (!valid_) {
return false;
}
valid_ = false;
return dm_.DeleteDevice(name_);
}
std::string path() const { return path_; }
const std::string& name() const { return name_; }
bool valid() const { return valid_; }
TempDevice(const TempDevice&) = delete;
TempDevice& operator=(const TempDevice&) = delete;
TempDevice& operator=(TempDevice&& other) noexcept {
name_ = other.name_;
valid_ = other.valid_;
other.valid_ = false;
return *this;
}
private:
DeviceMapper& dm_;
std::string name_;
std::string path_;
bool valid_;
};
TEST(libdm, DmLinear) {
unique_fd tmp1(CreateTempFile("file_1", 4096));
ASSERT_GE(tmp1, 0);

48
fs_mgr/libdm/test_util.h
View file

@ -20,8 +20,12 @@
#include <android-base/unique_fd.h>
#include <stddef.h>
#include <chrono>
#include <string>
#include <libdm/dm.h>
#include <libdm/dm_table.h>
namespace android {
namespace dm {
@ -29,6 +33,50 @@ namespace dm {
// created with a fixed size.
android::base::unique_fd CreateTempFile(const std::string& name, size_t size);
// Helper to ensure that device mapper devices are released.
class TempDevice {
public:
TempDevice(const std::string& name, const DmTable& table)
: dm_(DeviceMapper::Instance()), name_(name), valid_(false) {
valid_ = dm_.CreateDevice(name, table, &path_, std::chrono::seconds(5));
}
TempDevice(TempDevice&& other) noexcept
: dm_(other.dm_), name_(other.name_), path_(other.path_), valid_(other.valid_) {
other.valid_ = false;
}
~TempDevice() {
if (valid_) {
dm_.DeleteDevice(name_);
}
}
bool Destroy() {
if (!valid_) {
return false;
}
valid_ = false;
return dm_.DeleteDevice(name_);
}
std::string path() const { return path_; }
const std::string& name() const { return name_; }
bool valid() const { return valid_; }
TempDevice(const TempDevice&) = delete;
TempDevice& operator=(const TempDevice&) = delete;
TempDevice& operator=(TempDevice&& other) noexcept {
name_ = other.name_;
valid_ = other.valid_;
other.valid_ = false;
return *this;
}
private:
DeviceMapper& dm_;
std::string name_;
std::string path_;
bool valid_;
};
} // namespace dm
} // namespace android