diff options
author | Frode Lundgren <frodelu@verizonmedia.com> | 2020-09-24 15:47:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-24 15:47:00 +0200 |
commit | 9faf82288a2e2f97094bbe6d426c798e0f198c33 (patch) | |
tree | 2c89ef51907ce9c219a12a85f947b4ac941c78a0 /controller-api/src/test/java/com | |
parent | e7596b401ac579b1be0ed54183f64bfdc3d591bf (diff) | |
parent | acb13c9f0cce8ccd4a529d3c7a3f99fe66ed0003 (diff) |
Merge pull request #13977 from vespa-engine/frodelu/multi-level-flagdirs
Support multiple levels of directories for flags
Diffstat (limited to 'controller-api/src/test/java/com')
-rw-r--r-- | controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchiveTest.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchiveTest.java b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchiveTest.java index 4cdbe5241bc..21e89cb5ea3 100644 --- a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchiveTest.java +++ b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/systemflags/v1/SystemFlagsDataArchiveTest.java @@ -84,6 +84,19 @@ public class SystemFlagsDataArchiveTest { } @Test + public void supports_multi_level_flags_directory() { + var archive = SystemFlagsDataArchive.fromDirectory(Paths.get("src/test/resources/system-flags-multi-level/")); + assertFlagDataHasValue(archive, MY_TEST_FLAG, mainControllerTarget, "default"); + } + + @Test + public void duplicated_flagdata_is_detected() { + expectedException.expect(IllegalArgumentException.class); + expectedException.expectMessage("Flag data file in 'flags/group-1/my-test-flag/default.json' contains redundant flag data for id 'my-test-flag' already set in another directory!"); + var archive = SystemFlagsDataArchive.fromDirectory(Paths.get("src/test/resources/system-flags-multi-level-with-duplicated-flagdata/")); + } + + @Test public void empty_files_are_handled_as_no_flag_data_for_target() { var archive = SystemFlagsDataArchive.fromDirectory(Paths.get("src/test/resources/system-flags/")); assertNoFlagData(archive, FLAG_WITH_EMPTY_DATA, mainControllerTarget); |