Chromium Code Reviews| Index: ios/chrome/browser/ui/reading_list/reading_list_egtest.mm |
| diff --git a/ios/chrome/browser/ui/reading_list/reading_list_egtest.mm b/ios/chrome/browser/ui/reading_list/reading_list_egtest.mm |
| index a5bffdb80322d5a7528286aebd2850454f0cbc44..7d8fa490d1cff2779e2faf8628511300be9a1c6a 100644 |
| --- a/ios/chrome/browser/ui/reading_list/reading_list_egtest.mm |
| +++ b/ios/chrome/browser/ui/reading_list/reading_list_egtest.mm |
| @@ -382,6 +382,7 @@ void AssertIsShowingDistillablePage(bool online) { |
| - (void)tearDown { |
| web::test::HttpServer& server = web::test::HttpServer::GetSharedInstance(); |
| + server.SetSuspend(NO); |
|
baxley
2017/06/07 18:21:06
are there any side-effects to calling this after t
huangml1
2017/06/08 01:02:51
No. The method just sets the variable to "NO" and
|
| if (!server.IsRunning()) { |
| server.StartOrDie(); |
| base::test::ios::SpinRunLoopWithMinDelay( |
| @@ -450,8 +451,7 @@ void AssertIsShowingDistillablePage(bool online) { |
| // Tests that sharing a web page to the Reading List results in a snackbar |
| // appearing, and that the Reading List entry is present in the Reading List. |
| // Loads online version by tapping on entry. |
| -// TODO(crbug.com/724555): Re-enable the test. |
| -- (void)DISABLED_testSavingToReadingListAndLoadNormal { |
| +- (void)testSavingToReadingListAndLoadNormal { |
| auto network_change_disabler = |
| base::MakeUnique<net::NetworkChangeNotifier::DisableForTest>(); |
| auto wifi_network = base::MakeUnique<WifiNetworkChangeNotifier>(); |
| @@ -478,7 +478,7 @@ void AssertIsShowingDistillablePage(bool online) { |
| AssertIsShowingDistillablePage(true); |
| // Stop server to reload offline. |
| - server.Stop(); |
| + server.SetSuspend(YES); |
| base::test::ios::SpinRunLoopWithMinDelay( |
| base::TimeDelta::FromSecondsD(kServerOperationDelay)); |
| @@ -490,8 +490,7 @@ void AssertIsShowingDistillablePage(bool online) { |
| // Tests that sharing a web page to the Reading List results in a snackbar |
| // appearing, and that the Reading List entry is present in the Reading List. |
| // Loads offline version by tapping on entry without web server. |
| -// TODO(crbug.com/724555): Re-enable the test. |
| -- (void)DISABLED_testSavingToReadingListAndLoadNoNetwork { |
| +- (void)testSavingToReadingListAndLoadNoNetwork { |
| auto network_change_disabler = |
| base::MakeUnique<net::NetworkChangeNotifier::DisableForTest>(); |
| auto wifi_network = base::MakeUnique<WifiNetworkChangeNotifier>(); |
| @@ -514,7 +513,7 @@ void AssertIsShowingDistillablePage(bool online) { |
| WaitForDistillation(); |
| // Stop server to generate error. |
| - server.Stop(); |
| + server.SetSuspend(YES); |
| base::test::ios::SpinRunLoopWithMinDelay( |
| base::TimeDelta::FromSecondsD(kServerOperationDelay)); |
| // Long press the entry, and open it offline. |
| @@ -522,7 +521,7 @@ void AssertIsShowingDistillablePage(bool online) { |
| AssertIsShowingDistillablePage(false); |
| // Start server to reload online error. |
| - server.StartOrDie(); |
| + server.SetSuspend(NO); |
| base::test::ios::SpinRunLoopWithMinDelay( |
| base::TimeDelta::FromSecondsD(kServerOperationDelay)); |
| web::test::SetUpSimpleHttpServer(ResponsesForDistillationServer()); |