From f375220f0bd68b1a3015836ae9f263b341292139 Mon Sep 17 00:00:00 2001
From: zhouxinyong <zhouxinyong@inspur.com>
Date: Wed, 1 Nov 2023 10:18:16 +0800
Subject: [PATCH] Fixes the several problems/errors caused by tox

Change-Id: I267c52ae96cc91e017141bf6bde9b8a7067a87fe
---
 tox.ini | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tox.ini b/tox.ini
index c3e8a16..1f09e8e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,7 +18,10 @@ deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
 commands = stestr run {posargs}
-passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
+passenv =
+    http_proxy
+    https_proxy
+    no_proxy
 
 [testenv:debug-py36]
 basepython = python3.6
@@ -39,6 +42,8 @@ commands =
     doc8 doc/source
     # Run bashate checks
     bash -c "find sahara_plugin_mapr -iname '*.sh' -print0 | xargs -0 bashate -v"
+allowlist_externals =
+    bash
 
 [testenv:venv]
 commands = {posargs}
@@ -50,7 +55,7 @@ deps =
 commands =
     rm -rf doc/build/html
     sphinx-build -W -b html doc/source doc/build/html
-whitelist_externals =
+allowlist_externals =
     rm
 
 [testenv:pdf-docs]
@@ -59,7 +64,7 @@ commands =
     rm -rf doc/build/pdf
     sphinx-build -W -b latex doc/source doc/build/pdf
     make -C doc/build/pdf
-whitelist_externals =
+allowlist_externals =
     make
     rm
 
@@ -70,7 +75,7 @@ deps =
 commands =
   rm -rf releasenotes/build releasenotes/html
   sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
-whitelist_externals = rm
+allowlist_externals = rm
 
 [testenv:debug]
 # It runs tests from the specified dir (default is sahara_plugin_mapr/tests)