Skip to content

Commit

Permalink
Remove overriden setting so CI passes.
Browse files Browse the repository at this point in the history
Also add some clarifying comments and use a better test name for the test that fails when a setting is overriden.
  • Loading branch information
brettle committed Apr 25, 2024
1 parent 27d3bd2 commit 932d1cf
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
6 changes: 5 additions & 1 deletion src/main/java/org/carlmontrobotics/Config.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ abstract class Config implements Sendable {
public static final Config CONFIG = new Config() {
{
// Override config settings here, like this:
this.exampleFlagEnabled = true;
// this.exampleFlagEnabled = true;

// NOTE: PRs with overrides will NOT be merged because we don't want them
// polluting the master branch.
// Feel free to add them when testing, but remove them before pushing.
}
};

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/carlmontrobotics/ConfigTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void testToString() {

@Test
@EnabledIfEnvironmentVariable(named = "testCONFIGIsDefault", matches = "true", disabledReason = "not trying to modify GitHub master")
public void testCONFIGIsDefault() throws Exception {
public void testNoConfigSettingsOverridden() throws Exception {
var publishedStrings = new HashMap<String, String>();
try (SendableBuilder testBuilder = new SendableBuilderImpl() {
@Override
Expand Down

0 comments on commit 932d1cf

Please sign in to comment.