You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2017/02/15 18:30:57 UTC
[04/28] brooklyn-server git commit: uncomment another assertion about
inherited config
uncomment another assertion about inherited config
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/2d762c4c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/2d762c4c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/2d762c4c
Branch: refs/heads/master
Commit: 2d762c4c9ee4dd4345fe1b4419cf4f52fb8e1ff3
Parents: 667c3df
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Nov 24 17:34:10 2016 +0000
Committer: Alex Heneveld <al...@Alexs-MacBook-Pro.local>
Committed: Tue Dec 6 10:05:21 2016 +0000
----------------------------------------------------------------------
.../brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/2d762c4c/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
index f9868f8..c7c9643 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlEntityTest.java
@@ -884,8 +884,7 @@ public class CatalogYamlEntityTest extends AbstractYamlTest {
assertEquals(child.config().get(ConfigKeys.newStringConfigKey("myconf3.from.root")), "myval");
assertEquals(app.config().get(ConfigKeys.newStringConfigKey("myconf2")), "myval");
- // TODO Because of https://issues.apache.org/jira/browse/BROOKLYN-267, the assertion below fails:
- // assertEquals(child.config().get(ConfigKeys.newStringConfigKey("myconf3")), "myval");
+ assertEquals(child.config().get(ConfigKeys.newStringConfigKey("myconf3")), "myval");
mgmt().getCatalog().deleteCatalogItem(id, version);
}