zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable broken Android rtc_unittests.

Browse Source 
After disabling all of these, the rest of the tests pass, at least on
my Nexus 7 device.

BUG=webrtc:4364

Review-Url: https://codereview.webrtc.org/2151823002
Cr-Commit-Position: refs/heads/master@{#13485}
This commit is contained in:
phoglund
2016-07-15 03:57:12 -07:00
committed by Commit bot
parent 9d34148714
commit bb738733ea
4 changed files with 66 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
webrtc/base/optionsfile_unittest.cc
View File

@ -35,16 +35,23 @@ static int kTestInt2 = 67890;
static int kNegInt = -634;
static int kZero = 0;
class OptionsFileTest : public testing::Test {
#if defined (WEBRTC_ANDROID)
// Fails on Android: https://bugs.chromium.org/p/webrtc/issues/detail?id=4364.
#define MAYBE_OptionsFileTest DISABLED_OptionsFileTest
#else
#define MAYBE_OptionsFileTest OptionsFileTest
#endif
class MAYBE_OptionsFileTest : public testing::Test {
public:
OptionsFileTest() {
MAYBE_OptionsFileTest() {
Pathname dir;
ASSERT(Filesystem::GetTemporaryFolder(dir, true, NULL));
test_file_ = Filesystem::TempFilename(dir, ".testfile");
OpenStore();
}
~OptionsFileTest() override {
~MAYBE_OptionsFileTest() override {
remove(test_file_.c_str());
}
@ -59,7 +66,7 @@ class OptionsFileTest : public testing::Test {
std::string test_file_;
};
TEST_F(OptionsFileTest, GetSetString) {
TEST_F(MAYBE_OptionsFileTest, GetSetString) {
// Clear contents of the file on disk.
EXPECT_TRUE(store_->Save());
std::string out1, out2;
@ -85,7 +92,7 @@ TEST_F(OptionsFileTest, GetSetString) {
EXPECT_FALSE(store_->GetStringValue(kTestOptionB, &out2));
}
TEST_F(OptionsFileTest, GetSetInt) {
TEST_F(MAYBE_OptionsFileTest, GetSetInt) {
// Clear contents of the file on disk.
EXPECT_TRUE(store_->Save());
int out1, out2;
@ -117,7 +124,7 @@ TEST_F(OptionsFileTest, GetSetInt) {
EXPECT_EQ(kZero, out1);
}
TEST_F(OptionsFileTest, Persist) {
TEST_F(MAYBE_OptionsFileTest, Persist) {
// Clear contents of the file on disk.
EXPECT_TRUE(store_->Save());
EXPECT_TRUE(store_->SetStringValue(kTestOptionA, kTestString1));
@ -135,7 +142,7 @@ TEST_F(OptionsFileTest, Persist) {
EXPECT_EQ(kNegInt, out2);
}
TEST_F(OptionsFileTest, SpecialCharacters) {
TEST_F(MAYBE_OptionsFileTest, SpecialCharacters) {
// Clear contents of the file on disk.
EXPECT_TRUE(store_->Save());
std::string out;