Merge "Modify how to disable logging in unit test."

diff --cc functest/tests/unit/ci/test_prepare_env.py
Simple merge

diff --cc functest/tests/unit/cli/commands/test_cli_env.py
Simple merge

diff --cc functest/tests/unit/cli/commands/test_cli_os.py
Simple merge

diff --cc functest/tests/unit/cli/commands/test_cli_testcase.py
Simple merge

diff --cc functest/tests/unit/cli/commands/test_cli_tier.py
Simple merge

diff --cc functest/tests/unit/odl/test_odl.py
Simple merge

diff --cc functest/tests/unit/openstack/rally/test_rally.py
Simple merge

diff --cc functest/tests/unit/openstack/tempest/test_tempest.py
Simple merge

diff --cc functest/tests/unit/utils/test_functest_utils.py
Simple merge