summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test
diff options
context:
space:
mode:
authorShawn Pearce <spearce@spearce.org>2013-04-10 20:56:13 -0400
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>2013-04-10 20:56:13 -0400
commitb5cbfa0146051568673c50e8efba90d782963856 (patch)
treecccaea2b71a71a6213ffd9cc4b65bb9f59d7811c /org.eclipse.jgit.test
parent8272f6573016abe7e583533f0f1f8cf657f3de91 (diff)
parent6c0bb4351df033b3e79fd9e3f846af7a25864fed (diff)
downloadjgit-b5cbfa0146051568673c50e8efba90d782963856.tar.gz
jgit-b5cbfa0146051568673c50e8efba90d782963856.zip
Merge changes Ideecc472,I2b12788a,I6cb9382d,I12cd3326,I200baa0b,I05626f2e,I65e45422
* changes: Increase PackOutputStream copy buffer to 64 KiB Tighten object header writing in PackOutuptStream Skip main thread test in ThreadSafeProgressMonitor Declare members of PackOutputStream final Always allocate the PackOutputStream copyBuffer Disable CRC32 computation when no PackIndex will be created Steal work from delta threads to rebalance CPU load
Diffstat (limited to 'org.eclipse.jgit.test')
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ThreadSafeProgressMonitorTest.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ThreadSafeProgressMonitorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ThreadSafeProgressMonitorTest.java
index b44970e358..2845f8acfe 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ThreadSafeProgressMonitorTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ThreadSafeProgressMonitorTest.java
@@ -104,9 +104,11 @@ public class ThreadSafeProgressMonitorTest {
assertEquals(42, mock.value);
pm.update(1);
+ pm.pollForUpdates();
assertEquals(43, mock.value);
pm.update(2);
+ pm.pollForUpdates();
assertEquals(45, mock.value);
pm.endTask();