Repository: flume Updated Branches: refs/heads/trunk beb11e598 -> d1f24f56c
FLUME-3218 fixing executable permission in test case in a more portab way This closes #199 Reviewers: Denes Arvay (Ferenc Szabo via Ferenc Szabo) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/d1f24f56 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/d1f24f56 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/d1f24f56 Branch: refs/heads/trunk Commit: d1f24f56ce9714bb3e1edc671da290c75a17dead Parents: beb11e5 Author: Ferenc Szabo <szabofe...@apache.org> Authored: Fri Feb 23 10:35:02 2018 +0100 Committer: Ferenc Szabo <szabofe...@apache.org> Committed: Fri Feb 23 10:35:02 2018 +0100 ---------------------------------------------------------------------- .../pom.xml | 42 -------------------- .../TestExternalProcessConfigFilter.java | 7 +++- 2 files changed, 6 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/d1f24f56/flume-ng-configfilters/flume-ng-external-process-config-filter/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-configfilters/flume-ng-external-process-config-filter/pom.xml b/flume-ng-configfilters/flume-ng-external-process-config-filter/pom.xml index 5b28166..460c266 100644 --- a/flume-ng-configfilters/flume-ng-external-process-config-filter/pom.xml +++ b/flume-ng-configfilters/flume-ng-external-process-config-filter/pom.xml @@ -44,46 +44,4 @@ limitations under the License. <scope>test</scope> </dependency> </dependencies> - <profiles> - <!-- workaround fro test resource permission errors --> - <profile> - <id>unix</id> - <activation> - <os> - <family>unix</family> - </os> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <id>fix-resource-permissions</id> - <goals> - <goal>exec</goal> - </goals> - <phase>process-test-resources</phase> - <configuration> - <executable>/bin/sh</executable> - <arguments> - <argument>-c</argument> - <argument> - set -x - - SRC="${basedir}/src/test/resources" - DST="${project.build.directory}/test-classes" - - find "$$SRC" -printf "%P\0" | xargs -0 -I {} chmod --reference="$$SRC/{}" -f "$$DST/{}" - </argument> - </arguments> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flume/blob/d1f24f56/flume-ng-configfilters/flume-ng-external-process-config-filter/src/test/java/org/apache/flume/configfilter/TestExternalProcessConfigFilter.java ---------------------------------------------------------------------- diff --git a/flume-ng-configfilters/flume-ng-external-process-config-filter/src/test/java/org/apache/flume/configfilter/TestExternalProcessConfigFilter.java b/flume-ng-configfilters/flume-ng-external-process-config-filter/src/test/java/org/apache/flume/configfilter/TestExternalProcessConfigFilter.java index efedc00..47553f0c 100644 --- a/flume-ng-configfilters/flume-ng-external-process-config-filter/src/test/java/org/apache/flume/configfilter/TestExternalProcessConfigFilter.java +++ b/flume-ng-configfilters/flume-ng-external-process-config-filter/src/test/java/org/apache/flume/configfilter/TestExternalProcessConfigFilter.java @@ -22,6 +22,7 @@ import org.apache.flume.configfilter.ExternalProcessConfigFilter; import org.junit.Before; import org.junit.Test; +import java.io.File; import java.util.HashMap; import static org.junit.Assert.assertEquals; @@ -45,13 +46,14 @@ public class TestExternalProcessConfigFilter { String file = Thread.currentThread().getContextClassLoader() .getResource("test.sh").getFile(); + File testExecutable = new File(file); + testExecutable.setExecutable(true); HashMap<String, String> configuration = new HashMap<>(); configuration.put("command", file); configFilter.initializeWithConfiguration(configuration); assertEquals(FILTERED, configFilter.filter(MY_PASSWORD_KEY)); assertEquals(FILTERED_2, configFilter.filter(MY_PASSWORD_KEY_2)); - } @Test @@ -59,6 +61,9 @@ public class TestExternalProcessConfigFilter { String file = Thread.currentThread().getContextClassLoader() .getResource("test_error.sh").getFile(); + File testExecutable = new File(file); + testExecutable.setExecutable(true); + HashMap<String, String> configuration = new HashMap<>(); configuration.put("command", file); configFilter.initializeWithConfiguration(configuration);
