admin/webrtc_m130
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
webrtc/base/filerotatingstream_unittest.cc
View File

@ -19,7 +19,14 @@
namespace rtc { namespace rtc {
class FileRotatingStreamTest : public ::testing::Test { #if defined (WEBRTC_ANDROID)
// Fails on Android: https://bugs.chromium.org/p/webrtc/issues/detail?id=4364.
#define MAYBE_FileRotatingStreamTest DISABLED_FileRotatingStreamTest
#else
#define MAYBE_FileRotatingStreamTest FileRotatingStreamTest
#endif
class MAYBE_FileRotatingStreamTest : public ::testing::Test {
protected: protected:
static const char* kFilePrefix; static const char* kFilePrefix;
static const size_t kMaxFileSize; static const size_t kMaxFileSize;
@ -94,11 +101,12 @@ class FileRotatingStreamTest : public ::testing::Test {
std::string dir_path_; std::string dir_path_;
}; };
const char* FileRotatingStreamTest::kFilePrefix = "FileRotatingStreamTest"; const char* MAYBE_FileRotatingStreamTest::kFilePrefix =
const size_t FileRotatingStreamTest::kMaxFileSize = 2; "FileRotatingStreamTest";
const size_t MAYBE_FileRotatingStreamTest::kMaxFileSize = 2;
// Tests that stream state is correct before and after Open / Close. // Tests that stream state is correct before and after Open / Close.
TEST_F(FileRotatingStreamTest, State) { TEST_F(MAYBE_FileRotatingStreamTest, State) {
Init("FileRotatingStreamTestState", kFilePrefix, kMaxFileSize, 3); Init("FileRotatingStreamTestState", kFilePrefix, kMaxFileSize, 3);
EXPECT_EQ(SS_CLOSED, stream_->GetState()); EXPECT_EQ(SS_CLOSED, stream_->GetState());
@ -109,7 +117,7 @@ TEST_F(FileRotatingStreamTest, State) {
} }
// Tests that nothing is written to file when data of length zero is written. // Tests that nothing is written to file when data of length zero is written.
TEST_F(FileRotatingStreamTest, EmptyWrite) { TEST_F(MAYBE_FileRotatingStreamTest, EmptyWrite) {
Init("FileRotatingStreamTestEmptyWrite", kFilePrefix, kMaxFileSize, 3); Init("FileRotatingStreamTestEmptyWrite", kFilePrefix, kMaxFileSize, 3);
ASSERT_TRUE(stream_->Open()); ASSERT_TRUE(stream_->Open());
@ -124,7 +132,7 @@ TEST_F(FileRotatingStreamTest, EmptyWrite) {
// Tests that a write operation followed by a read returns the expected data // Tests that a write operation followed by a read returns the expected data
// and writes to the expected files. // and writes to the expected files.
TEST_F(FileRotatingStreamTest, WriteAndRead) { TEST_F(MAYBE_FileRotatingStreamTest, WriteAndRead) {
Init("FileRotatingStreamTestWriteAndRead", kFilePrefix, kMaxFileSize, 3); Init("FileRotatingStreamTestWriteAndRead", kFilePrefix, kMaxFileSize, 3);
ASSERT_TRUE(stream_->Open()); ASSERT_TRUE(stream_->Open());
@ -158,7 +166,7 @@ TEST_F(FileRotatingStreamTest, WriteAndRead) {
// Tests that writing data greater than the total capacity of the files // Tests that writing data greater than the total capacity of the files
// overwrites the files correctly and is read correctly after. // overwrites the files correctly and is read correctly after.
TEST_F(FileRotatingStreamTest, WriteOverflowAndRead) { TEST_F(MAYBE_FileRotatingStreamTest, WriteOverflowAndRead) {
Init("FileRotatingStreamTestWriteOverflowAndRead", kFilePrefix, kMaxFileSize, Init("FileRotatingStreamTestWriteOverflowAndRead", kFilePrefix, kMaxFileSize,
3); 3);
ASSERT_TRUE(stream_->Open()); ASSERT_TRUE(stream_->Open());
@ -175,7 +183,7 @@ TEST_F(FileRotatingStreamTest, WriteOverflowAndRead) {
} }
// Tests that the returned file paths have the right folder and prefix. // Tests that the returned file paths have the right folder and prefix.
TEST_F(FileRotatingStreamTest, GetFilePath) { TEST_F(MAYBE_FileRotatingStreamTest, GetFilePath) {
Init("FileRotatingStreamTestGetFilePath", kFilePrefix, kMaxFileSize, 20); Init("FileRotatingStreamTestGetFilePath", kFilePrefix, kMaxFileSize, 20);
for (auto i = 0; i < 20; ++i) { for (auto i = 0; i < 20; ++i) {
Pathname path(stream_->GetFilePath(i)); Pathname path(stream_->GetFilePath(i));
@ -184,7 +192,16 @@ TEST_F(FileRotatingStreamTest, GetFilePath) {
} }
} }
class CallSessionFileRotatingStreamTest : public ::testing::Test { #if defined (WEBRTC_ANDROID)
// Fails on Android: https://bugs.chromium.org/p/webrtc/issues/detail?id=4364.
#define MAYBE_CallSessionFileRotatingStreamTest \
DISABLED_CallSessionFileRotatingStreamTest
#else
#define MAYBE_CallSessionFileRotatingStreamTest \
CallSessionFileRotatingStreamTest
#endif
class MAYBE_CallSessionFileRotatingStreamTest : public ::testing::Test {
protected: protected:
void Init(const std::string& dir_name, size_t max_total_log_size) { void Init(const std::string& dir_name, size_t max_total_log_size) {
Pathname test_path; Pathname test_path;
@ -237,7 +254,7 @@ class CallSessionFileRotatingStreamTest : public ::testing::Test {
// Tests that writing and reading to a stream with the smallest possible // Tests that writing and reading to a stream with the smallest possible
// capacity works. // capacity works.
TEST_F(CallSessionFileRotatingStreamTest, WriteAndReadSmallest) { TEST_F(MAYBE_CallSessionFileRotatingStreamTest, WriteAndReadSmallest) {
Init("CallSessionFileRotatingStreamTestWriteAndReadSmallest", 4); Init("CallSessionFileRotatingStreamTestWriteAndReadSmallest", 4);
ASSERT_TRUE(stream_->Open()); ASSERT_TRUE(stream_->Open());
@ -250,7 +267,7 @@ TEST_F(CallSessionFileRotatingStreamTest, WriteAndReadSmallest) {
// Tests that writing and reading to a stream with capacity lesser than 4MB // Tests that writing and reading to a stream with capacity lesser than 4MB
// behaves correctly. // behaves correctly.
TEST_F(CallSessionFileRotatingStreamTest, WriteAndReadSmall) { TEST_F(MAYBE_CallSessionFileRotatingStreamTest, WriteAndReadSmall) {
Init("CallSessionFileRotatingStreamTestWriteAndReadSmall", 8); Init("CallSessionFileRotatingStreamTestWriteAndReadSmall", 8);
ASSERT_TRUE(stream_->Open()); ASSERT_TRUE(stream_->Open());
@ -263,7 +280,7 @@ TEST_F(CallSessionFileRotatingStreamTest, WriteAndReadSmall) {
// Tests that writing and reading to a stream with capacity greater than 4MB // Tests that writing and reading to a stream with capacity greater than 4MB
// behaves correctly. // behaves correctly.
TEST_F(CallSessionFileRotatingStreamTest, WriteAndReadLarge) { TEST_F(MAYBE_CallSessionFileRotatingStreamTest, WriteAndReadLarge) {
Init("CallSessionFileRotatingStreamTestWriteAndReadLarge", 6 * 1024 * 1024); Init("CallSessionFileRotatingStreamTestWriteAndReadLarge", 6 * 1024 * 1024);
ASSERT_TRUE(stream_->Open()); ASSERT_TRUE(stream_->Open());
@ -290,7 +307,7 @@ TEST_F(CallSessionFileRotatingStreamTest, WriteAndReadLarge) {
// Tests that writing and reading to a stream where only the first file is // Tests that writing and reading to a stream where only the first file is
// written to behaves correctly. // written to behaves correctly.
TEST_F(CallSessionFileRotatingStreamTest, WriteAndReadFirstHalf) { TEST_F(MAYBE_CallSessionFileRotatingStreamTest, WriteAndReadFirstHalf) {
Init("CallSessionFileRotatingStreamTestWriteAndReadFirstHalf", Init("CallSessionFileRotatingStreamTestWriteAndReadFirstHalf",
6 * 1024 * 1024); 6 * 1024 * 1024);
ASSERT_TRUE(stream_->Open()); ASSERT_TRUE(stream_->Open());

21
webrtc/base/fileutils_unittest.cc
View File

@ -17,14 +17,21 @@
namespace rtc { namespace rtc {
#if defined (WEBRTC_ANDROID)
// Fails on Android: https://bugs.chromium.org/p/webrtc/issues/detail?id=4364.
#define MAYBE_FilesystemTest DISABLED_FilesystemTest
#else
#define MAYBE_FilesystemTest FilesystemTest
#endif
// Make sure we can get a temp folder for the later tests. // Make sure we can get a temp folder for the later tests.
TEST(FilesystemTest, GetTemporaryFolder) { TEST(MAYBE_FilesystemTest, GetTemporaryFolder) {
Pathname path; Pathname path;
EXPECT_TRUE(Filesystem::GetTemporaryFolder(path, true, NULL)); EXPECT_TRUE(Filesystem::GetTemporaryFolder(path, true, NULL));
} }
// Test creating a temp file, reading it back in, and deleting it. // Test creating a temp file, reading it back in, and deleting it.
TEST(FilesystemTest, TestOpenFile) { TEST(MAYBE_FilesystemTest, TestOpenFile) {
Pathname path; Pathname path;
EXPECT_TRUE(Filesystem::GetTemporaryFolder(path, true, NULL)); EXPECT_TRUE(Filesystem::GetTemporaryFolder(path, true, NULL));
path.SetPathname(Filesystem::TempFilename(path, "ut")); path.SetPathname(Filesystem::TempFilename(path, "ut"));
@ -52,7 +59,7 @@ TEST(FilesystemTest, TestOpenFile) {
} }
// Test opening a non-existent file. // Test opening a non-existent file.
TEST(FilesystemTest, TestOpenBadFile) { TEST(MAYBE_FilesystemTest, TestOpenBadFile) {
Pathname path; Pathname path;
EXPECT_TRUE(Filesystem::GetTemporaryFolder(path, true, NULL)); EXPECT_TRUE(Filesystem::GetTemporaryFolder(path, true, NULL));
path.SetFilename("not an actual file"); path.SetFilename("not an actual file");
@ -65,7 +72,7 @@ TEST(FilesystemTest, TestOpenBadFile) {
// Test that CreatePrivateFile fails for existing files and succeeds for // Test that CreatePrivateFile fails for existing files and succeeds for
// non-existent ones. // non-existent ones.
TEST(FilesystemTest, TestCreatePrivateFile) { TEST(MAYBE_FilesystemTest, TestCreatePrivateFile) {
Pathname path; Pathname path;
EXPECT_TRUE(Filesystem::GetTemporaryFolder(path, true, NULL)); EXPECT_TRUE(Filesystem::GetTemporaryFolder(path, true, NULL));
path.SetFilename("private_file_test"); path.SetFilename("private_file_test");
@ -86,7 +93,7 @@ TEST(FilesystemTest, TestCreatePrivateFile) {
} }
// Test checking for free disk space. // Test checking for free disk space.
TEST(FilesystemTest, TestGetDiskFreeSpace) { TEST(MAYBE_FilesystemTest, TestGetDiskFreeSpace) {
// Note that we should avoid picking any file/folder which could be located // Note that we should avoid picking any file/folder which could be located
// at the remotely mounted drive/device. // at the remotely mounted drive/device.
Pathname path; Pathname path;
@ -119,12 +126,12 @@ TEST(FilesystemTest, TestGetDiskFreeSpace) {
} }
// Tests that GetCurrentDirectory() returns something. // Tests that GetCurrentDirectory() returns something.
TEST(FilesystemTest, TestGetCurrentDirectory) { TEST(MAYBE_FilesystemTest, TestGetCurrentDirectory) {
EXPECT_FALSE(Filesystem::GetCurrentDirectory().empty()); EXPECT_FALSE(Filesystem::GetCurrentDirectory().empty());
} }
// Tests that GetAppPathname returns something. // Tests that GetAppPathname returns something.
TEST(FilesystemTest, TestGetAppPathname) { TEST(MAYBE_FilesystemTest, TestGetAppPathname) {
Pathname path; Pathname path;
EXPECT_TRUE(Filesystem::GetAppPathname(&path)); EXPECT_TRUE(Filesystem::GetAppPathname(&path));
EXPECT_FALSE(path.empty()); EXPECT_FALSE(path.empty());

9
webrtc/base/logging_unittest.cc
View File

@ -128,7 +128,14 @@ TEST(LogTest, WallClockStartTime) {
} }
// Test the time required to write 1000 80-character logs to an unbuffered file. // Test the time required to write 1000 80-character logs to an unbuffered file.
TEST(LogTest, Perf) { #if defined (WEBRTC_ANDROID)
// Fails on Android: https://bugs.chromium.org/p/webrtc/issues/detail?id=4364.
#define MAYBE_Perf DISABLED_Perf
#else
#define MAYBE_Perf Perf
#endif
TEST(LogTest, MAYBE_Perf) {
Pathname path; Pathname path;
EXPECT_TRUE(Filesystem::GetTemporaryFolder(path, true, NULL)); EXPECT_TRUE(Filesystem::GetTemporaryFolder(path, true, NULL));
path.SetPathname(Filesystem::TempFilename(path, "ut")); path.SetPathname(Filesystem::TempFilename(path, "ut"));

21
webrtc/base/optionsfile_unittest.cc
View File

@ -35,16 +35,23 @@ static int kTestInt2 = 67890;
static int kNegInt = -634; static int kNegInt = -634;
static int kZero = 0; 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: public:
OptionsFileTest() { MAYBE_OptionsFileTest() {
Pathname dir; Pathname dir;
ASSERT(Filesystem::GetTemporaryFolder(dir, true, NULL)); ASSERT(Filesystem::GetTemporaryFolder(dir, true, NULL));
test_file_ = Filesystem::TempFilename(dir, ".testfile"); test_file_ = Filesystem::TempFilename(dir, ".testfile");
OpenStore(); OpenStore();
} }
~OptionsFileTest() override { ~MAYBE_OptionsFileTest() override {
remove(test_file_.c_str()); remove(test_file_.c_str());
} }
@ -59,7 +66,7 @@ class OptionsFileTest : public testing::Test {
std::string test_file_; std::string test_file_;
}; };
TEST_F(OptionsFileTest, GetSetString) { TEST_F(MAYBE_OptionsFileTest, GetSetString) {
// Clear contents of the file on disk. // Clear contents of the file on disk.
EXPECT_TRUE(store_->Save()); EXPECT_TRUE(store_->Save());
std::string out1, out2; std::string out1, out2;
@ -85,7 +92,7 @@ TEST_F(OptionsFileTest, GetSetString) {
EXPECT_FALSE(store_->GetStringValue(kTestOptionB, &out2)); EXPECT_FALSE(store_->GetStringValue(kTestOptionB, &out2));
} }
TEST_F(OptionsFileTest, GetSetInt) { TEST_F(MAYBE_OptionsFileTest, GetSetInt) {
// Clear contents of the file on disk. // Clear contents of the file on disk.
EXPECT_TRUE(store_->Save()); EXPECT_TRUE(store_->Save());
int out1, out2; int out1, out2;
@ -117,7 +124,7 @@ TEST_F(OptionsFileTest, GetSetInt) {
EXPECT_EQ(kZero, out1); EXPECT_EQ(kZero, out1);
} }
TEST_F(OptionsFileTest, Persist) { TEST_F(MAYBE_OptionsFileTest, Persist) {
// Clear contents of the file on disk. // Clear contents of the file on disk.
EXPECT_TRUE(store_->Save()); EXPECT_TRUE(store_->Save());
EXPECT_TRUE(store_->SetStringValue(kTestOptionA, kTestString1)); EXPECT_TRUE(store_->SetStringValue(kTestOptionA, kTestString1));
@ -135,7 +142,7 @@ TEST_F(OptionsFileTest, Persist) {
EXPECT_EQ(kNegInt, out2); EXPECT_EQ(kNegInt, out2);
} }
TEST_F(OptionsFileTest, SpecialCharacters) { TEST_F(MAYBE_OptionsFileTest, SpecialCharacters) {
// Clear contents of the file on disk. // Clear contents of the file on disk.
EXPECT_TRUE(store_->Save()); EXPECT_TRUE(store_->Save());
std::string out; std::string out;