Skip to content

Commit b3caf78

Browse files
tjgqcopybara-github
authored andcommitted
Delete unnecessary dummy module.
The comment says this module exists for testing purposes, but no tests fail without it. (Even if some did, they should arguably add it themselves.) PiperOrigin-RevId: 869115712 Change-Id: Id90dea48583a12e218f7252bab90962aed14da62
1 parent 7c9b70b commit b3caf78

File tree

3 files changed

+5
-65
lines changed

3 files changed

+5
-65
lines changed

src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1703,17 +1703,14 @@ public BlazeRuntime build() throws AbruptExitException {
17031703

17041704
Preconditions.checkNotNull(clock);
17051705

1706-
int metricsModules = 0;
1706+
BlazeModule metricsModule = null;
17071707
for (BlazeModule module : blazeModules) {
17081708
if (module.postsBuildMetricsEvent()) {
1709-
metricsModules++;
1709+
checkState(metricsModule == null, "more than one module may post a BuildMetricsEvent");
1710+
metricsModule = module;
17101711
}
17111712
}
1712-
Preconditions.checkArgument(
1713-
metricsModules < 2, "At most one module may post a BuildMetricsEvent");
1714-
if (metricsModules == 0) {
1715-
blazeModules.add(new DummyMetricsModule());
1716-
}
1713+
17171714
var blazeServicesCopy = ImmutableList.copyOf(blazeServices);
17181715
for (BlazeModule module : blazeModules) {
17191716
module.blazeServicesAvailable(blazeServicesCopy);

src/main/java/com/google/devtools/build/lib/runtime/DummyMetricsModule.java

Lines changed: 0 additions & 56 deletions
This file was deleted.

src/test/java/com/google/devtools/build/lib/runtime/BlazeRuntimeTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,7 @@ public void returnsBothModulesAndServicesAsOptionsSuppliers() throws Exception {
344344

345345
BlazeRuntime runtime = createRuntime(ImmutableList.of(module), ImmutableList.of(service));
346346

347-
// Additional modules may be registered internally, e.g. DummyMetricsModule.
348-
assertThat(runtime.getOptionsSuppliers()).containsAtLeast(module, service);
347+
assertThat(runtime.getOptionsSuppliers()).containsExactly(module, service);
349348
}
350349

351350
private BlazeRuntime createRuntime() throws Exception {

0 commit comments

Comments
 (0)