diff options
author | Klaus Aehlig <aehlig@google.com> | 2016-06-21 08:44:15 +0000 |
---|---|---|
committer | Philipp Wollermann <philwo@google.com> | 2016-06-21 09:59:33 +0000 |
commit | cd211eebe4a2eb776ecf7ee65cc5954aa1110e48 (patch) | |
tree | c3f9359bc3c877c1b361acce402209df56f47d0e /src/test/java/com/google/devtools/build | |
parent | 7ec10f916afa89975a3451b2083591d9191cd615 (diff) |
Add an option for the number of actions shown in the experimental UI
Currently, the experimental UI always shows the 3 oldest, still running actions.
While this seems a reasonable default, some users requested to be able to change
the number of actions shown. Hence replace the hard-coded value by a flag.
While there, also fix an off-by-one error in deciding when to put the ellipsis
symbol.
--
Change-Id: I037d208360fa1d3f100c99ab1ab1f5fc140138ac
Reviewed-on: https://bazel-review.googlesource.com/#/c/3811
MOS_MIGRATED_REVID=125427168
Diffstat (limited to 'src/test/java/com/google/devtools/build')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/runtime/ExperimentalStateTrackerTest.java | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/runtime/ExperimentalStateTrackerTest.java b/src/test/java/com/google/devtools/build/lib/runtime/ExperimentalStateTrackerTest.java index ead2c53e46..da25a610b9 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/ExperimentalStateTrackerTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/ExperimentalStateTrackerTest.java @@ -199,6 +199,42 @@ public class ExperimentalStateTrackerTest extends FoundationTestCase { } @Test + public void testSampleSize() throws IOException { + // Verify that the number of actions shown in the progress bar can be set as sample size. + ManualClock clock = new ManualClock(); + clock.advanceMillis(TimeUnit.SECONDS.toMillis(123)); + ExperimentalStateTracker stateTracker = new ExperimentalStateTracker(clock); + clock.advanceMillis(TimeUnit.SECONDS.toMillis(2)); + + // Start 10 actions (numbered 0 to 9). + for (int i = 0; i < 10; i++) { + clock.advanceMillis(TimeUnit.SECONDS.toMillis(1)); + Action action = mockAction("Performing action A" + i + ".", "action_A" + i + ".out"); + stateTracker.actionStarted(new ActionStartedEvent(action, clock.nanoTime())); + } + + // For various sample sizes verify the progress bar + for (int i = 1; i < 11; i++) { + stateTracker.setSampleSize(i); + LoggingTerminalWriter terminalWriter = new LoggingTerminalWriter(/*discardHighlight=*/ true); + stateTracker.writeProgressBar(terminalWriter); + String output = terminalWriter.getTranscript(); + assertTrue( + "Action " + (i - 1) + " should still be shown in the output: '" + output, + output.contains("A" + (i - 1) + ".")); + assertFalse( + "Action " + i + " should not be shown in the output: " + output, + output.contains("A" + i + ".")); + if (i < 10) { + assertTrue("Ellipsis symbol should be shown in output: " + output, output.contains("...")); + } else { + assertFalse( + "Ellipsis symbol should not be shown in output: " + output, output.contains("...")); + } + } + } + + @Test public void testTimesShown() throws IOException { // For sufficiently long running actions, the time that has passed since their start is shown. // In the short version of the progress bar, this should be true at least for the oldest action. |