brooklyn-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahgittin <...@git.apache.org>
Subject [GitHub] brooklyn-server pull request #411: Test change to coercion of default config...
Date Mon, 07 Nov 2016 12:22:14 GMT
Github user ahgittin commented on a diff in the pull request:

    https://github.com/apache/brooklyn-server/pull/411#discussion_r86764782
  
    --- Diff: camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractYamlTest.java
---
    @@ -112,7 +113,14 @@ protected void waitForApplicationTasks(Entity app) {
         }
     
         protected String loadYaml(String yamlFileName, String ...extraLines) throws Exception
{
    -        String input = new ResourceUtils(this).getResourceAsString(yamlFileName).trim();
    +        ResourceUtils ru = new ResourceUtils(this);
    +        if (!ru.doesUrlExist(yamlFileName)) {
    +            if (ru.doesUrlExist(Urls.mergePaths(getClass().getPackage().getName().replace('.',
'/'), yamlFileName))) {
    +                // look in package-specific folder if not found at root
    +                yamlFileName = Urls.mergePaths(getClass().getPackage().getName().replace('.',
'/'), yamlFileName);
    --- End diff --
    
    the package-specific name is only used if the original path **isn't** found *and* the
package-specific one **is** -- in which case i think it's correct to use the package-specific
name in the error


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message