From: kong wei <kong.wei2@zte.com.cn>
Date: Sun, 19 Feb 2017 14:56:32 +0000 (+0000)
Subject: Merge "ESCALATOR-40 add unittest framework"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d40c048940b252b50355ea3aaf409f65edb6da5d;hp=-c;p=escalator.git

Merge "ESCALATOR-40 add unittest framework"
---

d40c048940b252b50355ea3aaf409f65edb6da5d
diff --combined api/tox.ini
index 65f48a8,df74702..f5c9d10
--- a/api/tox.ini
+++ b/api/tox.ini
@@@ -9,7 -9,7 +9,7 @@@ usedevelop = Tru
  install_command = pip install -U {opts} {packages}
  deps = -r{toxinidir}/requirements.txt
         -r{toxinidir}/test-requirements.txt
- commands = lockutils-wrapper python setup.py testr --slowest --testr-args='{posargs}'
+ commands = python setup.py testr --slowest --testr-args='{posargs}'
  whitelist_externals = bash
  
  [tox:jenkins]
@@@ -18,8 -18,6 +18,6 @@@ downloadcache = ~/cache/pi
  [testenv:pep8]
  commands =
    flake8 {posargs}
-   # Check that .po and .pot files are valid:
-   bash -c "find escalator -type f -regex '.*\.pot?' -print0|xargs -0 -n 1 msgfmt --check-format -o /dev/null"
  
  [testenv:cover]
  setenv = VIRTUAL_ENV={envdir}
@@@ -39,10 -37,12 +37,10 @@@ commands = python setup.py build_sphin
  # TODO(dmllr): Analyze or fix the warnings blacklisted below
  # E711  comparison to None should be 'if cond is not None:'
  # E712  comparison to True should be 'if cond is True:' or 'if cond:'
 -# H302  import only modules
 -# H402  one line docstring needs punctuation.
  # H404  multi line docstring should start with a summary
  # H405  multi line docstring summary not separated with an empty line
  # H904  Wrap long lines in parentheses instead of a backslash
 -ignore = E711,E712,H302,H402,H404,H405,H904,F841,F821,E265,F812,F402,E226,E731
 +ignore = E711,E712,H404,H405,H904,F841,F821,E265,F812,F402,E226,E731
  exclude = .venv,.git,.tox,dist,doc,etc,*escalator/locale*,*openstack/common*,*lib/python*,*egg,build,escalator/i18n.py
  
  [hacking]