From 9f28a751ee342b77f653acbebfb10d6587af669a Mon Sep 17 00:00:00 2001 From: yuyang Date: Thu, 12 Jan 2017 15:55:00 +0800 Subject: Add paths to flake8 style check JIRA: BOTTLENECK-100 Add paths utils/ to flake8 style check and change tests.sh->verify.sh to make it self-explanatory Change-Id: I653dd4412633c026a47472abd25df021bcd093a4 Signed-off-by: yuyang --- flake8_cfg | 1 + tests.sh | 48 ------------------------------------------------ verify.sh | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 48 deletions(-) delete mode 100755 tests.sh create mode 100755 verify.sh diff --git a/flake8_cfg b/flake8_cfg index 578c0556..14bff2ff 100644 --- a/flake8_cfg +++ b/flake8_cfg @@ -2,3 +2,4 @@ format = pylint statistics = True count = True +show_source = True \ No newline at end of file diff --git a/tests.sh b/tests.sh deleted file mode 100755 index 18110770..00000000 --- a/tests.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -############################################################################## -# Copyright (c) 2016 Huawei Tech and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -# Run flake8, unit, coverage test - -getopts ":f" FILE_OPTION - -run_flake8() { - echo "Running flake8 ... " - logfile=test_results.log - if [ $FILE_OPTION == "f" ]; then - sudo flake8 --append-config=flake8_cfg testsuites/posca/ > $logfile - else - sudo flake8 --append-config=flake8_cfg testsuites/posca/ - fi - - if [ $? -ne 0 ]; then - echo "FAILED" - if [ $FILE_OPTION == "f" ]; then - echo "Results in $logfile" - fi - exit 1 - else - echo "OK" - fi -} - -run_tests() { - echo "Running unittest ... " - #will add future -} - -run_coverage() { - echo "Running coverage ..." - #will add future -} - -run_flake8 -run_tests -run_coverage diff --git a/verify.sh b/verify.sh new file mode 100755 index 00000000..1e0d0132 --- /dev/null +++ b/verify.sh @@ -0,0 +1,48 @@ +#!/bin/bash + +############################################################################## +# Copyright (c) 2016 Huawei Tech and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +# Run flake8, unit, coverage test + +getopts ":f" FILE_OPTION + +run_flake8() { + echo "Running flake8 ... " + logfile=flake8_verify.log + if [ $FILE_OPTION == "f" ]; then + flake8 --append-config=flake8_cfg testsuites/posca/ utils/ > $logfile + else + flake8 --append-config=flake8_cfg testsuites/posca/ utils/ + fi + + if [ $? -ne 0 ]; then + echo "FAILED" + if [ $FILE_OPTION == "f" ]; then + echo "Results in $logfile" + fi + exit 1 + else + echo "OK" + fi +} + +run_tests() { + echo "Running unittest ... " + #will add future +} + +run_coverage() { + echo "Running coverage ..." + #will add future +} + +run_flake8 +run_tests +run_coverage -- cgit 1.2.3-korg