Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Side by Side Diff: chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc

Issue 1637853002: Disabling AppRTC browser test until I can take a closer look. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/files/file_enumerator.h" 6 #include "base/files/file_enumerator.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/process/launch.h" 8 #include "base/process/launch.h"
9 #include "base/rand_util.h" 9 #include "base/rand_util.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 firefox_ = base::LaunchProcess(command_line, base::LaunchOptions()); 222 firefox_ = base::LaunchProcess(command_line, base::LaunchOptions());
223 return firefox_.IsValid(); 223 return firefox_.IsValid();
224 } 224 }
225 225
226 private: 226 private:
227 base::Process dev_appserver_; 227 base::Process dev_appserver_;
228 base::Process firefox_; 228 base::Process firefox_;
229 base::Process collider_server_; 229 base::Process collider_server_;
230 }; 230 };
231 231
232 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, MANUAL_WorksOnApprtc) { 232 // Broken because of dependency updates: http://crbug.com/581283.
233 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest,
234 DISABLED_MANUAL_WorksOnApprtc) {
233 DetectErrorsInJavaScript(); 235 DetectErrorsInJavaScript();
234 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999")); 236 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999"));
235 ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089")); 237 ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089"));
236 while (!LocalApprtcInstanceIsUp()) 238 while (!LocalApprtcInstanceIsUp())
237 DVLOG(1) << "Waiting for AppRTC to come up..."; 239 DVLOG(1) << "Waiting for AppRTC to come up...";
238 240
239 GURL room_url = GURL("http://localhost:9999/r/some_room" 241 GURL room_url = GURL("http://localhost:9999/r/some_room"
240 "?wshpp=localhost:8089&wstls=false"); 242 "?wshpp=localhost:8089&wstls=false");
241 243
242 // Set up the left tab. 244 // Set up the left tab.
(...skipping 19 matching lines...) Expand all
262 ASSERT_TRUE(WaitForCallToComeUp(left_tab)); 264 ASSERT_TRUE(WaitForCallToComeUp(left_tab));
263 ASSERT_TRUE(WaitForCallToComeUp(right_tab)); 265 ASSERT_TRUE(WaitForCallToComeUp(right_tab));
264 266
265 ASSERT_TRUE(DetectRemoteVideoPlaying(left_tab)); 267 ASSERT_TRUE(DetectRemoteVideoPlaying(left_tab));
266 ASSERT_TRUE(DetectRemoteVideoPlaying(right_tab)); 268 ASSERT_TRUE(DetectRemoteVideoPlaying(right_tab));
267 269
268 chrome::CloseWebContents(browser(), left_tab, false); 270 chrome::CloseWebContents(browser(), left_tab, false);
269 chrome::CloseWebContents(browser(), right_tab, false); 271 chrome::CloseWebContents(browser(), right_tab, false);
270 } 272 }
271 273
272 #if defined(OS_LINUX) 274 #if 0
273 #define MAYBE_MANUAL_FirefoxApprtcInteropTest MANUAL_FirefoxApprtcInteropTest 275 #define MAYBE_MANUAL_FirefoxApprtcInteropTest MANUAL_FirefoxApprtcInteropTest
274 #else 276 #else
275 // Not implemented yet on Windows and Mac. 277 // Not implemented yet on Windows and Mac.
278 // Broken because of dependency updates: http://crbug.com/581283.
276 #define MAYBE_MANUAL_FirefoxApprtcInteropTest DISABLED_MANUAL_FirefoxApprtcInter opTest 279 #define MAYBE_MANUAL_FirefoxApprtcInteropTest DISABLED_MANUAL_FirefoxApprtcInter opTest
277 #endif 280 #endif
278 281
279 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, 282 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest,
280 MAYBE_MANUAL_FirefoxApprtcInteropTest) { 283 MAYBE_MANUAL_FirefoxApprtcInteropTest) {
281 DetectErrorsInJavaScript(); 284 DetectErrorsInJavaScript();
282 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999")); 285 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999"));
283 ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089")); 286 ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089"));
284 while (!LocalApprtcInstanceIsUp()) 287 while (!LocalApprtcInstanceIsUp())
285 DVLOG(1) << "Waiting for AppRTC to come up..."; 288 DVLOG(1) << "Waiting for AppRTC to come up...";
(...skipping 10 matching lines...) Expand all
296 InfoBarService::FromWebContents(chrome_tab), InfoBarResponder::ACCEPT); 299 InfoBarService::FromWebContents(chrome_tab), InfoBarResponder::ACCEPT);
297 ui_test_utils::NavigateToURL(browser(), room_url); 300 ui_test_utils::NavigateToURL(browser(), room_url);
298 301
299 ASSERT_TRUE(LaunchFirefoxWithUrl(room_url)); 302 ASSERT_TRUE(LaunchFirefoxWithUrl(room_url));
300 303
301 ASSERT_TRUE(WaitForCallToComeUp(chrome_tab)); 304 ASSERT_TRUE(WaitForCallToComeUp(chrome_tab));
302 305
303 // Ensure Firefox manages to send video our way. 306 // Ensure Firefox manages to send video our way.
304 ASSERT_TRUE(DetectRemoteVideoPlaying(chrome_tab)); 307 ASSERT_TRUE(DetectRemoteVideoPlaying(chrome_tab));
305 } 308 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698