Skip BootloaderMessageTest, UncryptTest for devices without /misc

Skip these two tests if /misc partition is not found in fstab.

Bug: 35712836
Test: Both test skip correctly if there's no /misc in fstab.${hardware}.
Change-Id: I38417a8677030229a335e43eaef85ae70c4e0845
This commit is contained in:
Tianjie Xu
2017-02-28 12:26:29 -08:00
parent 021304503a
commit ca94856416
3 changed files with 111 additions and 3 deletions
+19 -1
View File
@@ -29,6 +29,8 @@
#include <bootloader_message/bootloader_message.h>
#include <gtest/gtest.h>
#include "common/component_test_util.h"
static const std::string UNCRYPT_SOCKET = "/dev/socket/uncrypt";
static const std::string INIT_SVC_SETUP_BCB = "init.svc.setup-bcb";
static const std::string INIT_SVC_CLEAR_BCB = "init.svc.clear-bcb";
@@ -37,7 +39,9 @@ static constexpr int SOCKET_CONNECTION_MAX_RETRY = 30;
class UncryptTest : public ::testing::Test {
protected:
virtual void SetUp() {
UncryptTest() : has_misc(true) {}
virtual void SetUp() override {
ASSERT_TRUE(android::base::SetProperty("ctl.stop", "setup-bcb"));
ASSERT_TRUE(android::base::SetProperty("ctl.stop", "clear-bcb"));
ASSERT_TRUE(android::base::SetProperty("ctl.stop", "uncrypt"));
@@ -57,10 +61,19 @@ class UncryptTest : public ::testing::Test {
}
ASSERT_TRUE(success) << "uncrypt service is not available.";
has_misc = parse_misc();
}
bool has_misc;
};
TEST_F(UncryptTest, setup_bcb) {
if (!has_misc) {
GTEST_LOG_(INFO) << "Test skipped due to no /misc partition found on the device.";
return;
}
// Trigger the setup-bcb service.
ASSERT_TRUE(android::base::SetProperty("ctl.start", "setup-bcb"));
@@ -126,6 +139,11 @@ TEST_F(UncryptTest, setup_bcb) {
}
TEST_F(UncryptTest, clear_bcb) {
if (!has_misc) {
GTEST_LOG_(INFO) << "Test skipped due to no /misc partition found on the device.";
return;
}
// Trigger the clear-bcb service.
ASSERT_TRUE(android::base::SetProperty("ctl.start", "clear-bcb"));