diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2020-09-23 08:48:59 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2020-09-23 08:48:59 +0200 |
| commit | e0bc3258030fed738fa39014572b7ca82e22b1d2 (patch) | |
| tree | 900d3d38161640c7414994fe01a7a1abbd79d6dd | |
| parent | 542e019e9321065099246a30c3397e72d8c6f16e (diff) | |
Relax test to verify meta is stored, but not its content
3 files changed, 5 insertions, 6 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java index 942c9ac037b..f3b4d1f6457 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java @@ -185,10 +185,9 @@ public class ControllerTest { assertNull("Deployment job was removed", context.instanceJobs().get(productionUsWest1)); // Submission has stored application meta. - assertArrayEquals(applicationPackage.metaDataZip(), - tester.controllerTester().serviceRegistry().applicationStore() - .getMeta(context.instanceId()) - .get(tester.clock().instant())); + assertNotNull(tester.controllerTester().serviceRegistry().applicationStore() + .getMeta(context.instanceId()) + .get(tester.clock().instant())); // Meta data tombstone placed on delete tester.clock().advance(Duration.ofSeconds(1)); diff --git a/document/src/main/java/com/yahoo/document/DocumentUtil.java b/document/src/main/java/com/yahoo/document/DocumentUtil.java index 6e781ce9011..78fe748dac8 100644 --- a/document/src/main/java/com/yahoo/document/DocumentUtil.java +++ b/document/src/main/java/com/yahoo/document/DocumentUtil.java @@ -3,7 +3,7 @@ package com.yahoo.document; /** * Class containing static utility function related to documents. - * @author einarmr + * @author Einar M Rosenvinge * @since 5.1.9 */ public class DocumentUtil { diff --git a/document/src/main/java/com/yahoo/document/json/JsonFeedReader.java b/document/src/main/java/com/yahoo/document/json/JsonFeedReader.java index 5da6b58ac98..3b275d571e0 100644 --- a/document/src/main/java/com/yahoo/document/json/JsonFeedReader.java +++ b/document/src/main/java/com/yahoo/document/json/JsonFeedReader.java @@ -23,7 +23,7 @@ import com.yahoo.vespaxmlparser.RemoveFeedOperation; * The feed reader will take ownership of the input stream and close it when the * last parseable document has been read. * - * @author steinar + * @author Steinar Knutsen */ public class JsonFeedReader implements FeedReader { |