SLIDER-450 additional fix to use default appConfig for accumulo testing
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/2a3a4ed6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/2a3a4ed6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/2a3a4ed6 Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: 2a3a4ed67789aa0833fe00ca1bb5bb9bd80816d1 Parents: f8210a7 Author: Billie Rinaldi <[email protected]> Authored: Sat Sep 27 13:02:51 2014 -0700 Committer: Billie Rinaldi <[email protected]> Committed: Sat Sep 27 13:02:51 2014 -0700 ---------------------------------------------------------------------- app-packages/accumulo/pom.xml | 8 ++++++++ .../apache/slider/funtest/accumulo/AccumuloBasicIT.groovy | 4 +--- 2 files changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/2a3a4ed6/app-packages/accumulo/pom.xml ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml index a2014f2..bc4b591 100644 --- a/app-packages/accumulo/pom.xml +++ b/app-packages/accumulo/pom.xml @@ -210,6 +210,14 @@ <filtering>true</filtering> <targetPath>${test.app.resources.dir}</targetPath> </resource> + <resource> + <directory>.</directory> + <filtering>true</filtering> + <targetPath>${test.app.resources.dir}</targetPath> + <includes> + <include>appConfig-default.json</include> + </includes> + </resource> </resources> <plugins> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/2a3a4ed6/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy b/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy index dad7601..12c0655 100644 --- a/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy +++ b/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy @@ -56,9 +56,7 @@ class AccumuloBasicIT extends AccumuloAgentCommandTestBase { String appTemplateFile = templateName() Configuration conf = new Configuration() FileSystem fs = FileSystem.getLocal(conf) - InputStream stream = SliderUtils.getApplicationResourceInputStream( - fs, new Path(TEST_APP_PKG_DIR, TEST_APP_PKG_FILE), - "appConfig-default.json"); + InputStream stream = new FileInputStream(sysprop("test.app.resources.dir") + "/appConfig-default.json") assert stream!=null, "Couldn't pull appConfig.json from app pkg" ConfTreeSerDeser c = new ConfTreeSerDeser() ConfTree t = c.fromStream(stream)
