Skip to content

Commit

Permalink
SPARK-1336 Reducing the output of run-tests script.
Browse files Browse the repository at this point in the history
Author: Prashant Sharma <[email protected]>
Author: Prashant Sharma <[email protected]>

Closes #262 from ScrapCodes/SPARK-1336/ReduceVerbosity and squashes the following commits:

87dfa54 [Prashant Sharma] Further reduction in noise and made pyspark tests to fail fast.
811170f [Prashant Sharma] Reducing the ouput of run-tests script.
  • Loading branch information
ScrapCodes authored and pwendell committed Mar 30, 2014
1 parent 2861b07 commit df1b9f7
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 11 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,4 @@ spark-*-bin.tar.gz
unit-tests.log
/lib/
rat-results.txt
scalastyle.txt
7 changes: 3 additions & 4 deletions dev/run-tests
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,17 @@ JAVA_VERSION=$($java_cmd -version 2>&1 | sed 's/java version "\(.*\)\.\(.*\)\..*
echo "========================================================================="
echo "Running Apache RAT checks"
echo "========================================================================="

dev/check-license

echo "========================================================================="
echo "Running Scala style checks"
echo "========================================================================="
sbt/sbt clean scalastyle
dev/scalastyle

echo "========================================================================="
echo "Running Spark unit tests"
echo "========================================================================="
sbt/sbt assembly test
sbt/sbt assembly test | grep -v -e "info.*Resolving" -e "warn.*Merging" -e "info.*Including"

echo "========================================================================="
echo "Running PySpark tests"
Expand All @@ -64,5 +63,5 @@ echo "========================================================================="
echo "Detecting binary incompatibilites with MiMa"
echo "========================================================================="
./bin/spark-class org.apache.spark.tools.GenerateMIMAIgnore
sbt/sbt mima-report-binary-issues
sbt/sbt mima-report-binary-issues | grep -v -e "info.*Resolving"

27 changes: 27 additions & 0 deletions dev/scalastyle
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/usr/bin/env bash

#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

sbt/sbt clean scalastyle > scalastyle.txt
ERRORS=$(cat scalastyle.txt | grep -e "error file")
if test ! -z "$ERRORS"; then
echo -e "Scalastyle checks failed at following occurrences:\n$ERRORS"
exit 1
else
echo -e "Scalastyle checks passed.\n"
fi
19 changes: 12 additions & 7 deletions python/run-tests
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,18 @@ FAILED=0
rm -f unit-tests.log

function run_test() {
SPARK_TESTING=0 $FWDIR/bin/pyspark $1 2>&1 | tee -a unit-tests.log
SPARK_TESTING=0 $FWDIR/bin/pyspark $1 2>&1 | tee -a > unit-tests.log
FAILED=$((PIPESTATUS[0]||$FAILED))

# Fail and exit on the first test failure.
if [[ $FAILED != 0 ]]; then
cat unit-tests.log | grep -v "^[0-9][0-9]*" # filter all lines starting with a number.
echo -en "\033[31m" # Red
echo "Had test failures; see logs."
echo -en "\033[0m" # No color
exit -1
fi

}

run_test "pyspark/rdd.py"
Expand All @@ -46,12 +56,7 @@ run_test "pyspark/mllib/clustering.py"
run_test "pyspark/mllib/recommendation.py"
run_test "pyspark/mllib/regression.py"

if [[ $FAILED != 0 ]]; then
echo -en "\033[31m" # Red
echo "Had test failures; see logs."
echo -en "\033[0m" # No color
exit -1
else
if [[ $FAILED == 0 ]]; then
echo -en "\033[32m" # Green
echo "Tests passed."
echo -en "\033[0m" # No color
Expand Down

0 comments on commit df1b9f7

Please sign in to comment.