Repository: accumulo Updated Branches: refs/heads/1.6.0-SNAPSHOT fa49e8041 -> ce38eeadc refs/heads/master 111b56dee -> eb72c5ba0
ACCUMULO-2503 Fix timezone-related failures in ShellTest Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ce38eead Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ce38eead Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ce38eead Branch: refs/heads/1.6.0-SNAPSHOT Commit: ce38eeadc41782fd62a0d46e63cbad93f7c997f6 Parents: fa49e80 Author: Josh Elser <els...@apache.org> Authored: Tue Mar 25 16:07:22 2014 -0700 Committer: Josh Elser <els...@apache.org> Committed: Tue Mar 25 16:07:22 2014 -0700 ---------------------------------------------------------------------- .../test/java/org/apache/accumulo/core/util/shell/ShellTest.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/ce38eead/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java index 82d1f34..3d9b89e 100644 --- a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java +++ b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java @@ -27,6 +27,7 @@ import java.io.PrintWriter; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.TimeZone; import jline.console.ConsoleReader; @@ -103,6 +104,7 @@ public class ShellTest { @Before public void setup() throws IOException { + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); Shell.log.setLevel(Level.OFF); output = new TestOutputStream(); input = new StringInputStream();
