You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by sr...@apache.org on 2013/04/26 17:50:55 UTC
[39/47] git commit: Fix for failing unit tests,
still dependent on updated fix to OOZIE-674
Fix for failing unit tests, still dependent on updated fix to OOZIE-674
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/ca7c16a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/ca7c16a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/ca7c16a2
Branch: refs/heads/master
Commit: ca7c16a2fc5bdc1806e32abcb932282edd8795bc
Parents: 5c3dd0e
Author: srikanth.sundarrajan <sr...@inmobi.com>
Authored: Sat Apr 20 04:33:21 2013 +1000
Committer: srikanth.sundarrajan <sr...@inmobi.com>
Committed: Sat Apr 20 04:33:21 2013 +1000
----------------------------------------------------------------------
pom.xml | 1 +
.../falcon/cluster/util/EmbeddedCluster.java | 3 ++-
.../falcon/resource/EntityManagerJerseyTest.java | 6 ++----
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/ca7c16a2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 52d6ffb..ef53e37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -691,6 +691,7 @@
<exclude>**/*.iml</exclude>
<exclude>**/target/**</exclude>
<exclude>**/activemq-data/**</exclude>
+ <exclude>**/build/**</exclude>
</excludes>
</configuration>
<executions>
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/ca7c16a2/test-util/src/main/java/org/apache/falcon/cluster/util/EmbeddedCluster.java
----------------------------------------------------------------------
diff --git a/test-util/src/main/java/org/apache/falcon/cluster/util/EmbeddedCluster.java b/test-util/src/main/java/org/apache/falcon/cluster/util/EmbeddedCluster.java
index 296decb..41f2d95 100644
--- a/test-util/src/main/java/org/apache/falcon/cluster/util/EmbeddedCluster.java
+++ b/test-util/src/main/java/org/apache/falcon/cluster/util/EmbeddedCluster.java
@@ -81,7 +81,8 @@ public class EmbeddedCluster {
System.setProperty("test.build.data", "webapp/target/" + name + "/data");
}
String user = System.getProperty("user.name");
- cluster.conf.set("hadoop.log.dir", "/tmp");
+ cluster.conf.set("hadoop.tmp.dir", target.getAbsolutePath());
+ cluster.conf.set("hadoop.log.dir", new File(target, "tmp").getAbsolutePath());
cluster.conf.set("hadoop.proxyuser.oozie.groups", "*");
cluster.conf.set("hadoop.proxyuser.oozie.hosts", "127.0.0.1");
cluster.conf.set("hadoop.proxyuser.hdfs.groups", "*");
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/ca7c16a2/webapp/src/test/java/org/apache/falcon/resource/EntityManagerJerseyTest.java
----------------------------------------------------------------------
diff --git a/webapp/src/test/java/org/apache/falcon/resource/EntityManagerJerseyTest.java b/webapp/src/test/java/org/apache/falcon/resource/EntityManagerJerseyTest.java
index ca2a968..39fa823 100644
--- a/webapp/src/test/java/org/apache/falcon/resource/EntityManagerJerseyTest.java
+++ b/webapp/src/test/java/org/apache/falcon/resource/EntityManagerJerseyTest.java
@@ -432,9 +432,7 @@ public class EntityManagerJerseyTest extends AbstractTestBase {
private List<Path> createTestData() throws Exception {
List<Path> list = new ArrayList<Path>();
- Configuration conf = new Configuration();
- conf.set("fs.default.name", "hdfs://localhost:8020");
- FileSystem fs = FileSystem.get(conf);
+ FileSystem fs = cluster.getFileSystem();
fs.mkdirs(new Path("/user/guest"));
fs.setOwner(new Path("/user/guest"), REMOTE_USER, "users");
@@ -477,7 +475,7 @@ public class EntityManagerJerseyTest extends AbstractTestBase {
path = new Path("/examples/input-data/rawLogs/" + formatter.format(date) + "/file");
list.add(path);
fs.create(path).close();
- new FsShell(conf).run(new String[]{"-chown", "-R", "guest:users", "/examples/input-data/rawLogs"});
+ new FsShell(cluster.getConf()).run(new String[]{"-chown", "-R", "guest:users", "/examples/input-data/rawLogs"});
return list;
}