From 1d36300260abc34e0f8cdfbfbbb39741a8681268 Mon Sep 17 00:00:00 2001
From: Camille Rodriguez <camille.rodriguez@canonical.com>
Date: Tue, 27 Aug 2019 10:03:47 -0400
Subject: [PATCH] Add disco-stein bundle to gate tests

The bundle disco-stein was in the dev bundles because
a bug with the Python 3.7 syntax prevented the success of
the deployment of HA clusters. This bug is fixed, we can
reintegrate disco-stein in the gate bundles.

Other small additions:
- removing sitepackages in tox.ini to avoid test env pollution
- skip_missing_interpreters in tox.ini set to False to avoid false
positives by skipping missing interpreters.

LP Related-Bug: #1823718
Change-Id: Ibc953a7da04fb6f8851c1698054542d7b1f1bdb0
---
 .../{dev-basic-disco-stein => gate-basic-disco-stein}      | 0
 src/tox.ini                                                | 4 ++++
 tox.ini                                                    | 7 +++++--
 3 files changed, 9 insertions(+), 2 deletions(-)
 rename src/tests/{dev-basic-disco-stein => gate-basic-disco-stein} (100%)

diff --git a/src/tests/dev-basic-disco-stein b/src/tests/gate-basic-disco-stein
similarity index 100%
rename from src/tests/dev-basic-disco-stein
rename to src/tests/gate-basic-disco-stein
diff --git a/src/tox.ini b/src/tox.ini
index 4c5f90e..ffdb931 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -4,6 +4,10 @@
 [tox]
 envlist = pep8
 skipsdist = True
+# NOTE(beisner): Avoid build/test env pollution by not enabling sitepackages.
+sitepackages = False
+# NOTE(beisner): Avoid false positives by not skipping missing interpreters.
+skip_missing_interpreters = False
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
diff --git a/tox.ini b/tox.ini
index 846123f..c6fd536 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,10 @@
 [tox]
 skipsdist = True
 envlist = pep8,py37
-skip_missing_interpreters = True
+# NOTE(beisner): Avoid build/test env pollution by not enabling sitepackages.
+sitepackages = False
+# NOTE(beisner): Avoid false positives by not skipping missing interpreters.
+skip_missing_interpreters = False
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
@@ -53,7 +56,7 @@ deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run {posargs}
 
 [testenv:pep8]
-basepython = python3.5
+basepython = python3
 deps = -r{toxinidir}/test-requirements.txt
 commands = flake8 {posargs} src unit_tests