diff options
author | Torne (Richard Coles) <torne@google.com> | 2014-06-25 10:31:37 +0100 |
---|---|---|
committer | Torne (Richard Coles) <torne@google.com> | 2014-06-25 10:31:37 +0100 |
commit | a77a80167b9acf91dfcd6c13fb76c0be2718030a (patch) | |
tree | b99a79c355a1b732cacef1fe12fb3e548305e5dc /app/webrtc/javatests/src | |
parent | 99bc8f39c7d7784a6d03c08add97b0f97c44db53 (diff) | |
parent | 0a0ddb3cfebff52b687644d139ed04e9c26954d5 (diff) | |
download | talk-lollipop-cts-release.tar.gz |
Merge from Chromium at DEPS revision 278856android-wear-5.0.0_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-devlollipop-cts-release
This commit was generated by merge_to_master.py.
Change-Id: I7dc08db577ee87432079e1e7508ea87dd8d0bc6c
Diffstat (limited to 'app/webrtc/javatests/src')
-rw-r--r-- | app/webrtc/javatests/src/org/webrtc/PeerConnectionTest.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/app/webrtc/javatests/src/org/webrtc/PeerConnectionTest.java b/app/webrtc/javatests/src/org/webrtc/PeerConnectionTest.java index b171b58..240e996 100644 --- a/app/webrtc/javatests/src/org/webrtc/PeerConnectionTest.java +++ b/app/webrtc/javatests/src/org/webrtc/PeerConnectionTest.java @@ -525,7 +525,7 @@ public class PeerConnectionTest extends TestCase { private void doTest() throws Exception { CountDownLatch testDone = new CountDownLatch(1); System.gc(); // Encourage any GC-related threads to start up. - //TreeSet<String> threadsBeforeTest = allThreads(); + TreeSet<String> threadsBeforeTest = allThreads(); PeerConnectionFactory factory = new PeerConnectionFactory(); // Uncomment to get ALL WebRTC tracing and SENSITIVE libjingle logging. @@ -742,11 +742,8 @@ public class PeerConnectionTest extends TestCase { factory.dispose(); System.gc(); - // TODO(ldixon): the usrsctp threads are not cleaned up (issue 2749) and - // caused the assert to fail. We should reenable the assert once issue 2749 - // is fixed. - //TreeSet<String> threadsAfterTest = allThreads(); - //assertEquals(threadsBeforeTest, threadsAfterTest); + TreeSet<String> threadsAfterTest = allThreads(); + assertEquals(threadsBeforeTest, threadsAfterTest); Thread.sleep(100); } |