You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2015/10/13 08:10:14 UTC
hbase git commit: HBASE-14588 Stop accessing test resources from
within src folder (Andrew Wang)
Repository: hbase
Updated Branches:
refs/heads/master 2428c5f46 -> a45cb72ef
HBASE-14588 Stop accessing test resources from within src folder (Andrew Wang)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a45cb72e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a45cb72e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a45cb72e
Branch: refs/heads/master
Commit: a45cb72ef23e3d1c52091a1a6376e8a3aeceed94
Parents: 2428c5f
Author: stack <st...@apache.org>
Authored: Mon Oct 12 23:10:06 2015 -0700
Committer: stack <st...@apache.org>
Committed: Mon Oct 12 23:10:06 2015 -0700
----------------------------------------------------------------------
hbase-server/src/test/data/0000000000000016310 | Bin 11776703 -> 0 bytes
...85428f5cb61.21e75333ada3d5bafb34bb918f29576c | Bin 24 -> 0 bytes
.../apache/hadoop/hbase/io/TestReference.java | 4 ++--
.../hbase/regionserver/TestRecoveredEdits.java | 6 +++---
.../src/test/resources/0000000000000016310 | Bin 0 -> 11776703 bytes
...85428f5cb61.21e75333ada3d5bafb34bb918f29576c | Bin 0 -> 24 bytes
pom.xml | 3 +++
7 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/a45cb72e/hbase-server/src/test/data/0000000000000016310
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/data/0000000000000016310 b/hbase-server/src/test/data/0000000000000016310
deleted file mode 100644
index 8e58c98..0000000
Binary files a/hbase-server/src/test/data/0000000000000016310 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/hbase/blob/a45cb72e/hbase-server/src/test/data/a6a6562b777440fd9c34885428f5cb61.21e75333ada3d5bafb34bb918f29576c
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/data/a6a6562b777440fd9c34885428f5cb61.21e75333ada3d5bafb34bb918f29576c b/hbase-server/src/test/data/a6a6562b777440fd9c34885428f5cb61.21e75333ada3d5bafb34bb918f29576c
deleted file mode 100644
index d16afff..0000000
Binary files a/hbase-server/src/test/data/a6a6562b777440fd9c34885428f5cb61.21e75333ada3d5bafb34bb918f29576c and /dev/null differ
http://git-wip-us.apache.org/repos/asf/hbase/blob/a45cb72e/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestReference.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestReference.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestReference.java
index 80295ff..0d18209 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestReference.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestReference.java
@@ -43,8 +43,8 @@ public class TestReference {
@Test
public void testParsingWritableReference() throws IOException {
// Read a Reference written w/ 0.94 out of the test data dir.
- final String datafile = System.getProperty("project.build.testSourceDirectory", "src/test") +
- File.separator + "data" + File.separator +
+ final String datafile = System.getProperty("test.build.classes",
+ "target/test-classes") + File.separator +
"a6a6562b777440fd9c34885428f5cb61.21e75333ada3d5bafb34bb918f29576c";
FileSystem fs = FileSystem.get(HTU.getConfiguration());
Reference.read(fs, new Path(datafile));
http://git-wip-us.apache.org/repos/asf/hbase/blob/a45cb72e/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRecoveredEdits.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRecoveredEdits.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRecoveredEdits.java
index c339bb1..f2acbdc 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRecoveredEdits.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRecoveredEdits.java
@@ -116,9 +116,9 @@ public class TestRecoveredEdits {
Path regionDir = region.getRegionDir(hbaseRootDir, hri);
Path recoveredEditsDir = WALSplitter.getRegionDirRecoveredEditsDir(regionDir);
// This is a little fragile getting this path to a file of 10M of edits.
- Path recoveredEditsFile = new Path(new Path(
- System.getProperty("project.build.testSourceDirectory", "src" + Path.SEPARATOR + "test"),
- "data"), "0000000000000016310");
+ Path recoveredEditsFile = new Path(
+ System.getProperty("test.build.classes", "target/test-classes"),
+ "0000000000000016310");
// Copy this file under the region's recovered.edits dir so it is replayed on reopen.
Path destination = new Path(recoveredEditsDir, recoveredEditsFile.getName());
fs.copyToLocalFile(recoveredEditsFile, destination);
http://git-wip-us.apache.org/repos/asf/hbase/blob/a45cb72e/hbase-server/src/test/resources/0000000000000016310
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/resources/0000000000000016310 b/hbase-server/src/test/resources/0000000000000016310
new file mode 100644
index 0000000..8e58c98
Binary files /dev/null and b/hbase-server/src/test/resources/0000000000000016310 differ
http://git-wip-us.apache.org/repos/asf/hbase/blob/a45cb72e/hbase-server/src/test/resources/a6a6562b777440fd9c34885428f5cb61.21e75333ada3d5bafb34bb918f29576c
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/resources/a6a6562b777440fd9c34885428f5cb61.21e75333ada3d5bafb34bb918f29576c b/hbase-server/src/test/resources/a6a6562b777440fd9c34885428f5cb61.21e75333ada3d5bafb34bb918f29576c
new file mode 100644
index 0000000..d16afff
Binary files /dev/null and b/hbase-server/src/test/resources/a6a6562b777440fd9c34885428f5cb61.21e75333ada3d5bafb34bb918f29576c differ
http://git-wip-us.apache.org/repos/asf/hbase/blob/a45cb72e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c9fc6a0..cb28c84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -575,6 +575,7 @@
<redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile>
<systemPropertyVariables>
<jacoco-agent.destfile>target/jacoco.exec</jacoco-agent.destfile>
+ <test.build.classes>${test.build.classes}</test.build.classes>
</systemPropertyVariables>
<excludes>
@@ -1305,6 +1306,8 @@
<hbase.skip-jacoco>true</hbase.skip-jacoco>
<jacoco.version>0.7.5.201505241946</jacoco.version>
<extra.enforcer.version>1.0-beta-3</extra.enforcer.version>
+ <!-- Location of test resources -->
+ <test.build.classes>${project.build.directory}/test-classes</test.build.classes>
</properties>
<!-- Sorted by groups of dependencies then groupId and artifactId -->
<dependencyManagement>