Commit 2ce49662 authored by Arthur Wang's avatar Arthur Wang Committed by Commit Bot

Revert "Reland "🤠 Revert "enable FeedNewTabPageCardInstrumentationTest" ""

This reverts commit 969fb156.

Reason for revert: The test fails because of a timestamp difference. Now we approved the new reference image and test should be stable by now. 

Original change's description:
> Reland "🤠 Revert "enable FeedNewTabPageCardInstrumentationTest" "
>
> This reverts commit d8ad718b.
>
> Reason for revert: Goldens break every day as they contain information relative to current time. Needs updating before they will consistently work.
>
> Original change's description:
> > Revert "🤠 Revert "enable FeedNewTabPageCardInstrumentationTest" "
> >
> > This reverts commit 1d9e3ca2.
> >
> > Reason for revert: Updated golden images, test should now pass
> >
> > Original change's description:
> > > 🤠 Revert "enable FeedNewTabPageCardInstrumentationTest" 
> > >
> > > This reverts commit 46de280d.
> > >
> > > Reason for revert: still flaky.
> > > See https://ci.chromium.org/p/chromium/builders/ci/android-marshmallow-x86-rel-non-cq/707
> > >
> > > Original change's description:
> > > > enable FeedNewTabPageCardInstrumentationTest
> > > >
> > > > Bug: 1143781
> > > > Change-Id: Ic7c1adad83cb472aeaeb8e82534288184a89d544
> > > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2518183
> > > > Reviewed-by: Dan H <harringtond@chromium.org>
> > > > Commit-Queue: Arthur Wang <wuwang@chromium.org>
> > > > Cr-Commit-Position: refs/heads/master@{#824229}
> > >
> > > TBR=harringtond@chromium.org,wuwang@chromium.org
> > >
> > > Change-Id: I9ccace6afc3b4193000d094392c78468887a6249
> > > No-Presubmit: true
> > > No-Tree-Checks: true
> > > No-Try: true
> > > Bug: 1143781
> > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2519975
> > > Reviewed-by: Arthur Sonzogni <arthursonzogni@chromium.org>
> > > Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org>
> > > Cr-Commit-Position: refs/heads/master@{#824385}
> >
> > TBR=arthursonzogni@chromium.org,harringtond@chromium.org,wuwang@chromium.org
> >
> > Change-Id: I632bfabe8eacccec82dbd00d231569398f809b2c
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Bug: 1143781
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2520812
> > Reviewed-by: Dan H <harringtond@chromium.org>
> > Commit-Queue: Dan H <harringtond@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#824433}
>
> TBR=arthursonzogni@chromium.org,harringtond@chromium.org,wuwang@chromium.org
>
> # Not skipping CQ checks because original CL landed > 1 day ago.
>
> Bug: 1143781
> Change-Id: Ia9f3b45b0f1924e809e95a0f7112b14237350623
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2526943
> Reviewed-by: Sky Malice <skym@chromium.org>
> Commit-Queue: Sky Malice <skym@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#825372}

TBR=skym@chromium.org,arthursonzogni@chromium.org,harringtond@chromium.org,wuwang@chromium.org

Change-Id: I60704b1368d4db93cca89fe2cedb6aa7cf9d5c3d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1143781
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2527361Reviewed-by: default avatarArthur Wang <wuwang@chromium.org>
Reviewed-by: default avatarDan H <harringtond@chromium.org>
Commit-Queue: Arthur Wang <wuwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825390}
parent b4325a75
...@@ -15,7 +15,6 @@ import org.junit.Test; ...@@ -15,7 +15,6 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.Feature;
import org.chromium.chrome.R; import org.chromium.chrome.R;
import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.flags.ChromeFeatureList;
...@@ -57,7 +56,6 @@ public final class FeedNewTabPageCardInstrumentationTest { ...@@ -57,7 +56,6 @@ public final class FeedNewTabPageCardInstrumentationTest {
@Feature({"FeedNewTabPage", "WPRRecordReplayTest", "RenderTest"}) @Feature({"FeedNewTabPage", "WPRRecordReplayTest", "RenderTest"})
@WPRArchiveDirectory("chrome/android/feed/core/javatests/src/org/chromium/chrome/" @WPRArchiveDirectory("chrome/android/feed/core/javatests/src/org/chromium/chrome/"
+ "browser/feed/wpr_tests") + "browser/feed/wpr_tests")
@DisabledTest(message = "https://crbug.com/1143781")
public void public void
launchNTP_withMultipleFeedCardsRendered() throws IOException, InterruptedException { launchNTP_withMultipleFeedCardsRendered() throws IOException, InterruptedException {
mActivityTestRule.loadUrlInNewTab(UrlConstants.NTP_URL); mActivityTestRule.loadUrlInNewTab(UrlConstants.NTP_URL);
......
0846bac870a018d9ed4820943700b2c978c5ccca ab80612a3f194f9402f97f25dc516305ab910715
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment