[9/9] git commit: PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping
PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/331e27ae Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/331e27ae Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/331e27ae Branch: refs/heads/master Commit: 331e27ae39cf13a8759c34a4f03bd14925fbc543 Parents: ebbe34c Author: James Taylor Authored: Sat Jul 26 07:34:29 2014 -0700 Committer: James Taylor Committed: Sat Jul 26 09:24:59 2014 -0700 -- .../src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/331e27ae/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java -- diff --git a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java index 9f118a6..8daea9c 100644 --- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java +++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java @@ -41,6 +41,7 @@ import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest; import org.apache.phoenix.jdbc.PhoenixDriver; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.PhoenixRuntime; +import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.SchemaUtil; import org.apache.phoenix.util.TestUtil; import org.apache.pig.ExecType; @@ -88,7 +89,7 @@ public class PhoenixHBaseLoaderIT { Class.forName(PhoenixDriver.class.getName()); zkQuorum = "localhost:" + hbaseTestUtil.getZkCluster().getClientPort(); -Properties props = TestUtil.TEST_PROPERTIES; +Properties props = PropertiesUtil.deepCopy(TestUtil.TEST_PROPERTIES); props.put(QueryServices.DROP_METADATA_ATTRIB, Boolean.toString(true)); conn = DriverManager.getConnection(PhoenixRuntime.JDBC_PROTOCOL + PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR + zkQuorum,props);
[9/9] git commit: PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping
PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d16e7c90 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d16e7c90 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d16e7c90 Branch: refs/heads/4.0 Commit: d16e7c905b8d59c499f55a8c0a64f85f9a3b0ecf Parents: 1b957bf Author: James Taylor Authored: Sat Jul 26 07:34:29 2014 -0700 Committer: James Taylor Committed: Sat Jul 26 08:51:02 2014 -0700 -- .../src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d16e7c90/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java -- diff --git a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java index 9f118a6..8daea9c 100644 --- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java +++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java @@ -41,6 +41,7 @@ import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest; import org.apache.phoenix.jdbc.PhoenixDriver; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.PhoenixRuntime; +import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.SchemaUtil; import org.apache.phoenix.util.TestUtil; import org.apache.pig.ExecType; @@ -88,7 +89,7 @@ public class PhoenixHBaseLoaderIT { Class.forName(PhoenixDriver.class.getName()); zkQuorum = "localhost:" + hbaseTestUtil.getZkCluster().getClientPort(); -Properties props = TestUtil.TEST_PROPERTIES; +Properties props = PropertiesUtil.deepCopy(TestUtil.TEST_PROPERTIES); props.put(QueryServices.DROP_METADATA_ATTRIB, Boolean.toString(true)); conn = DriverManager.getConnection(PhoenixRuntime.JDBC_PROTOCOL + PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR + zkQuorum,props);