From 4512aec2d434eaf4c743bc089e0319cb243ac349 Mon Sep 17 00:00:00 2001
From: Amrith Kumar <amrith@tesora.com>
Date: Mon, 29 Aug 2016 11:27:51 -0400
Subject: [PATCH] Cleanup trove's tox.ini and .gitignore

This commit cleans up a couple of issues with Trove's tox.ini.

1. something that was reported to me by Matthew Treinish who
observed that the tox jobs are oddly bundled together.

This is important because infra's reporting is unable to generate some
useful metrics and tracking of trove's jobs because of the way they
are tied together.

2. with the cleanup of docs, apidocs is no longer a directory and can
be cleaned up, similarly api-ref is a thing and should be handled in
.gitignore.

3. that py27 used to use testr, switched it to using ostestr. I've
retained it for coverage.

4. the sqlite db needs to be deleted between runs because we otherwise
fail (on a developer configuration) because some tests intentionally
appear to leave stuff around.

5. I've set all ostestr jobs to run with --serial because there are
clearly cases where multiple tests can attempt to setup the DB at the
same time and get into trouble. Till we can fix those (if we feel it
is worthwhile) it is more reliable to run ostestr in --serial mode. It
only takes 2.5 minutes. This includes the cover jobs which runs with
--no-parallel.

An infra change will follow that will enable testing jobs.

Change-Id: I0a971c6ef6c1a4669490f2aa0e67c795fe86e190
Closes-Bug: 1618098
Closes-Bug: 1618149
---
 .gitignore |  6 +-----
 tox.ini    | 46 +++++++++++++++++++++++++++-------------------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index c1318621af..30a01af972 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,11 +30,7 @@ install-guide/build/
 
 # Docs
 .DS_Store
-apidocs/.DS_Store
-apidocs/src/.DS_Store
-apidocs/src/samples/.DS_Store
-apidocs/includewars.xml
-apidocs/src/bookinfo.xml
+api-ref/build/
 
 # Files created by releasenotes build
 releasenotes/build
diff --git a/tox.ini b/tox.ini
index 7d6521031d..47445ad271 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,45 +1,54 @@
 [tox]
-envlist = py35,py34,py27,pep8,checkbuild,checklinks
+envlist = py{27,34,35},pep8,apiexamples,cover,api-ref,releasenotes,bandit,fakemodetests
 minversion = 1.6
 skipsdist = True
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
 usedevelop = True
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -U {opts} {packages}
+install_command = pip install \
+                  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} \
+                  -U {opts} {packages}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = find ./trove -type f -name "*.pyc" -delete
-           {envpython} run_tests.py
-           python setup.py testr --slowest
-           {envpython} generate_examples.py
-whitelist_externals = bash
-                      find
+           rm -f .testrepository/times.dbm
+           rm -f trove_test.sqlite
+whitelist_externals = find
+                      rm
+                      bash
 
 [tox:jenkins]
 sitepackages = True
 
 [testenv:pep8]
+basepython = python2.7
 commands =
     flake8
     # Check that .po and .pot files are valid:
     bash -c "find trove -type f -regex '.*\.pot?' -print0 | \
              xargs -0 -n 1 msgfmt --check-format -o /dev/null"
 
+[testenv:py27]
+commands = {[testenv]commands}
+           ostestr --slowest --serial
+
 [py3base]
-commands = rm -f .testrepository/times.dbm
-           find ./trove -type f -name "*.pyc" -delete
-           ostestr --blacklist_file=blacklist-py3.txt --serial
-whitelist_externals = rm
-                      find
+commands = ostestr --slowest --blacklist_file=blacklist-py3.txt --serial
 
 [testenv:py34]
-commands = {[py3base]commands}
-whitelist_externals = {[py3base]whitelist_externals}
+commands = {[testenv]commands}
+           {[py3base]commands}
 
 [testenv:py35]
-commands = {[py3base]commands}
-whitelist_externals = {[py3base]whitelist_externals}
+commands = {[testenv]commands}
+           {[py3base]commands}
+
+[testenv:apiexamples]
+commands = {envpython} generate_examples.py
+
+[testenv:fakemodetests]
+commands = {envpython} run_tests.py
 
 [testenv:debug]
 commands = oslo_debug_helper {posargs}
@@ -47,14 +56,14 @@ commands = oslo_debug_helper {posargs}
 [testenv:cover]
 basepython = python2.7
 commands =
+     {[testenv]commands}
      coverage erase
-     python setup.py testr --coverage
+     python setup.py testr --coverage --no-parallel
      coverage run -a run_tests.py
      coverage html
      coverage xml
      coverage report
 
-
 [testenv:venv]
 commands = {posargs}
 
@@ -73,7 +82,6 @@ filename=*.py,trove-*
 commands =
   rm -rf api-ref/build
   sphinx-build -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html
-whitelist_externals = rm
 
 [testenv:releasenotes]
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html