Merge branch 'S2GRAPH-211' * S2GRAPH-211: ignore -> test fix broken test
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/d29b6699 Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/d29b6699 Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/d29b6699 Branch: refs/heads/master Commit: d29b66996ee428cfc10e381b9c481405a63ddbf2 Parents: da2209d 0601716 Author: daewon <[email protected]> Authored: Thu May 3 11:02:52 2018 +0900 Committer: daewon <[email protected]> Committed: Thu May 3 11:02:52 2018 +0900 ---------------------------------------------------------------------- build.sbt | 2 +- .../org/apache/s2graph/core/schema/Schema.scala | 3 +- s2jobs/build.sbt | 4 +++ .../org/apache/s2graph/s2jobs/task/Task.scala | 13 ++++--- .../apache/s2graph/s2jobs/BaseSparkTest.scala | 37 +++++++++++++++++--- .../s2jobs/loader/GraphFileGeneratorTest.scala | 7 ++++ .../apache/s2graph/s2jobs/task/SinkTest.scala | 15 ++++---- .../apache/s2graph/s2jobs/task/SourceTest.scala | 9 +++-- 8 files changed, 70 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
