Bug 95599 – [Chromium-Android] Remove test_expectations_android.txt

• Component: Tools / Tests
• Status: RESOLVED INVALID

[Xianzhu Wang]

LayoutTests/platform/chromium/test_expectations_android.txt is used to store Android-specific expectations. It's empty in upstream. As we have upstreamed most of the contents in downstream test_expectations_android.txt, it's time to remove it.

[Xianzhu Wang]

In downstream we'll keep test_expectations_android.txt for some time and use --additional-expectations to include the file.

[Xianzhu Wang]

Created attachment 161754 [details]
Patch

[Dirk Pranke]

alternatively, you could leave it in, upstream it, and add it to the end of the expectations_files() list (so it was included in the cascade) and then move your skipped tests there from skipped_layout_tests().

[Dirk Pranke]

(In reply to comment #3)
> alternatively, you could leave it in, upstream it, and add it to the end of the expectations_files() list (so it was included in the cascade) and then move your skipped tests there from skipped_layout_tests().

Whoops, of course you already have it in expectations_files(). So, you could leave it there and moved the skipped tests there. I'd probably recommend that as, as much as we're not used to having an additional expectations file for android, we're used to having a list of tests embedded in the code even less.

Or we could just add an ANDROID modifier to the TestExpectations syntax and move those lines into the main file.

[Dirk Pranke]

(I r+'ed the change so it's up to you ... whichever you want to do).

[Xianzhu Wang]

(In reply to comment #5)
> (I r+'ed the change so it's up to you ... whichever you want to do).

Thanks for review. Our goal is to upstream all contents in test_expectations_android.txt into TestExpectations, so I prefer to remove it from upstream. Will only submit after downstream change (using --additional-expectations in downstream buildbot script) is ready.

The directories hard-coded in skipped_layout_tests() doesn't look good. I tried to put them in TestExpectations, but it's not easy to skip whole directories because in TestExpectations there are many existing rules of individual tests under the directories. Filed bug 95605.

[Xianzhu Wang]

Using the method in bug 95605, abandon this one because we want to keep test_expectations_android.txt to skip the whole directories.

[Adam Barth]

Comment on attachment 161754 [details]
Patch

That's exciting!

[Adam Barth]

(In reply to comment #8)
> (From update of attachment 161754 [details])
> That's exciting!

Oh, I guess this didn't land.

[Xianzhu Wang]

(In reply to comment #9)
> (In reply to comment #8)
> > (From update of attachment 161754 [details] [details])
> > That's exciting!
> 
> Oh, I guess this didn't land.

Yeah, it's also exciting to keep only a minimal platform/chromium-android/TestExpectations (bug 95605) :)