diff options
| -rwxr-xr-x | ci/verify.sh | 14 | ||||
| -rw-r--r-- | docker/storperf-master/storperf/db/job_db.py | 2 | ||||
| -rw-r--r-- | docker/storperf-master/tests/carbon_tests/json_to_carbon_test.py | 4 |
3 files changed, 11 insertions, 9 deletions
diff --git a/ci/verify.sh b/ci/verify.sh index 996a3af..aedbf26 100755 --- a/ci/verify.sh +++ b/ci/verify.sh @@ -18,13 +18,13 @@ fi virtualenv $WORKSPACE/storperf_venv source $WORKSPACE/storperf_venv/bin/activate -pip install --upgrade setuptools==33.1.1 -pip install autoflake==0.6.6 -pip install autopep8==1.2.2 -pip install coverage==4.1 -pip install cryptography==1.7.2 -pip install flake8==2.5.4 -pip install mock==1.3.0 +pip install --upgrade setuptools +pip install autoflake==1.2 +pip install autopep8==1.3.5 +pip install coverage==4.5.1 +#pip install cryptography +pip install flake8==3.5.0 +pip install mock==2.0.0 pip install nose==1.3.7 pip install -r docker/storperf-master/requirements.pip diff --git a/docker/storperf-master/storperf/db/job_db.py b/docker/storperf-master/storperf/db/job_db.py index eb35cac..b029a35 100644 --- a/docker/storperf-master/storperf/db/job_db.py +++ b/docker/storperf-master/storperf/db/job_db.py @@ -265,7 +265,7 @@ class JobDB(object): break try: data = json.loads(row[1]) - except: + except Exception: data = row[1] params[row[0]] = data db.close() diff --git a/docker/storperf-master/tests/carbon_tests/json_to_carbon_test.py b/docker/storperf-master/tests/carbon_tests/json_to_carbon_test.py index 523ff77..6043f10 100644 --- a/docker/storperf-master/tests/carbon_tests/json_to_carbon_test.py +++ b/docker/storperf-master/tests/carbon_tests/json_to_carbon_test.py @@ -7,10 +7,11 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -from storperf.carbon.converter import Converter import json import unittest +from storperf.carbon.converter import Converter + class JSONToCarbonTest(unittest.TestCase): @@ -112,5 +113,6 @@ class JSONToCarbonTest(unittest.TestCase): "value", result["list_with_spaces.1.key"], result["list_with_spaces.1.key"]) + if __name__ == '__main__': unittest.main() |