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

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

Issue 865323002: Temporarily disable the apprtc tests due to a closure comiler change on github. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 firefox_ = base::LaunchProcess(command_line, base::LaunchOptions()); 217 firefox_ = base::LaunchProcess(command_line, base::LaunchOptions());
218 return firefox_.IsValid(); 218 return firefox_.IsValid();
219 } 219 }
220 220
221 private: 221 private:
222 base::Process dev_appserver_; 222 base::Process dev_appserver_;
223 base::Process firefox_; 223 base::Process firefox_;
224 base::Process collider_server_; 224 base::Process collider_server_;
225 }; 225 };
226 226
227 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, MANUAL_WorksOnApprtc) { 227 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, DISABLED_MANUAL_WorksOnApprtc) {
228 // Disabled on Win XP: http://code.google.com/p/webrtc/issues/detail?id=2703. 228 // Disabled on Win XP: http://code.google.com/p/webrtc/issues/detail?id=2703.
229 if (OnWinXp()) 229 if (OnWinXp())
230 return; 230 return;
231 231
232 DetectErrorsInJavaScript(); 232 DetectErrorsInJavaScript();
233 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999")); 233 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999"));
234 ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089")); 234 ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089"));
235 while (!LocalApprtcInstanceIsUp()) 235 while (!LocalApprtcInstanceIsUp())
236 DVLOG(1) << "Waiting for AppRTC to come up..."; 236 DVLOG(1) << "Waiting for AppRTC to come up...";
237 237
(...skipping 10 matching lines...) Expand all
248 ASSERT_TRUE(WaitForCallToComeUp(right_tab)); 248 ASSERT_TRUE(WaitForCallToComeUp(right_tab));
249 249
250 ASSERT_TRUE(DetectRemoteVideoPlaying(left_tab)); 250 ASSERT_TRUE(DetectRemoteVideoPlaying(left_tab));
251 ASSERT_TRUE(DetectRemoteVideoPlaying(right_tab)); 251 ASSERT_TRUE(DetectRemoteVideoPlaying(right_tab));
252 252
253 chrome::CloseWebContents(browser(), left_tab, false); 253 chrome::CloseWebContents(browser(), left_tab, false);
254 chrome::CloseWebContents(browser(), right_tab, false); 254 chrome::CloseWebContents(browser(), right_tab, false);
255 } 255 }
256 256
257 #if defined(OS_LINUX) 257 #if defined(OS_LINUX)
258 #define MAYBE_MANUAL_FirefoxApprtcInteropTest MANUAL_FirefoxApprtcInteropTest 258 #define MAYBE_MANUAL_FirefoxApprtcInteropTest DISABLED_MANUAL_FirefoxApprtcInter opTest
259 #else 259 #else
260 // Not implemented yet on Windows and Mac. 260 // Not implemented yet on Windows and Mac.
261 #define MAYBE_MANUAL_FirefoxApprtcInteropTest DISABLED_MANUAL_FirefoxApprtcInter opTest 261 #define MAYBE_MANUAL_FirefoxApprtcInteropTest DISABLED_MANUAL_FirefoxApprtcInter opTest
262 #endif 262 #endif
263 263
264 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, 264 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest,
265 MAYBE_MANUAL_FirefoxApprtcInteropTest) { 265 MAYBE_MANUAL_FirefoxApprtcInteropTest) {
266 // Disabled on Win XP: http://code.google.com/p/webrtc/issues/detail?id=2703. 266 // Disabled on Win XP: http://code.google.com/p/webrtc/issues/detail?id=2703.
267 if (OnWinXp()) 267 if (OnWinXp())
268 return; 268 return;
269 269
270 DetectErrorsInJavaScript(); 270 DetectErrorsInJavaScript();
271 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999")); 271 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999"));
272 ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089")); 272 ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089"));
273 while (!LocalApprtcInstanceIsUp()) 273 while (!LocalApprtcInstanceIsUp())
274 DVLOG(1) << "Waiting for AppRTC to come up..."; 274 DVLOG(1) << "Waiting for AppRTC to come up...";
275 275
276 GURL room_url = GURL("http://localhost:9999/r/some_room" 276 GURL room_url = GURL("http://localhost:9999/r/some_room"
277 "?wshpp=localhost:8089&wstls=false" 277 "?wshpp=localhost:8089&wstls=false"
278 "&firefox_fake_device=1"); 278 "&firefox_fake_device=1");
279 content::WebContents* chrome_tab = OpenPageAndAcceptUserMedia(room_url); 279 content::WebContents* chrome_tab = OpenPageAndAcceptUserMedia(room_url);
280 280
281 ASSERT_TRUE(LaunchFirefoxWithUrl(room_url)); 281 ASSERT_TRUE(LaunchFirefoxWithUrl(room_url));
282 282
283 ASSERT_TRUE(WaitForCallToComeUp(chrome_tab)); 283 ASSERT_TRUE(WaitForCallToComeUp(chrome_tab));
284 284
285 // Ensure Firefox manages to send video our way. 285 // Ensure Firefox manages to send video our way.
286 ASSERT_TRUE(DetectRemoteVideoPlaying(chrome_tab)); 286 ASSERT_TRUE(DetectRemoteVideoPlaying(chrome_tab));
287 } 287 }
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