From 3186a72942d7cbbef1dc27bd89d0a047e66263ed Mon Sep 17 00:00:00 2001 From: chao liu Date: Mon, 29 Jan 2018 05:32:50 -0800 Subject: [PATCH] use . instead of source. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Code conventions: Use “.” to source script files When you have to source a script file, for example, a credentials file to gain access to user-only or admin-only CLI commands, use . instead of source. See more: http://docs.openstack.org/contributor-guide/writing-style/code-conventions Change-Id: Ia823df50f65b26695458a509a0e0d94a4646afb3 --- devstack/plugin.sh | 2 +- functionaltests/pre_test_hook.sh | 2 +- functionaltests/pre_test_hook_congress.sh | 2 +- functionaltests/pre_test_hook_mistral.sh | 2 +- functionaltests/run_tests.sh | 4 ++-- functionaltests/run_tests_congress_mistral.sh | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index e8b78a9e1..29330d932 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -496,7 +496,7 @@ function configure_murano_tempest_plugin() { # - configure_murano_dashboard # - cleanup_murano_dashboard -source $TOP_DIR/lib/horizon +. $TOP_DIR/lib/horizon # Defaults # -------- diff --git a/functionaltests/pre_test_hook.sh b/functionaltests/pre_test_hook.sh index f8b7ca741..ace53d1a8 100755 --- a/functionaltests/pre_test_hook.sh +++ b/functionaltests/pre_test_hook.sh @@ -3,6 +3,6 @@ # This script is executed inside pre_test_hook function in devstack gate. # Install Murano devstack integration -source ./pre_test_hook_common.sh +. ./pre_test_hook_common.sh MURANO_BASE=/opt/stack/new/murano/contrib/devstack diff --git a/functionaltests/pre_test_hook_congress.sh b/functionaltests/pre_test_hook_congress.sh index 9f8ef2879..8f2acd4ce 100755 --- a/functionaltests/pre_test_hook_congress.sh +++ b/functionaltests/pre_test_hook_congress.sh @@ -1,6 +1,6 @@ #!/bin/bash # Install Congress devstack integration -source ./pre_test_hook_common.sh +. ./pre_test_hook_common.sh CONGRESS_BASE=/opt/stack/new/congress/contrib/devstack diff --git a/functionaltests/pre_test_hook_mistral.sh b/functionaltests/pre_test_hook_mistral.sh index 34de7a164..50ac3a4c8 100755 --- a/functionaltests/pre_test_hook_mistral.sh +++ b/functionaltests/pre_test_hook_mistral.sh @@ -1,5 +1,5 @@ #!/bin/bash # Install Mistral devstack integration -source ./pre_test_hook_common.sh +. ./pre_test_hook_common.sh MISTRAL_BASE=/opt/stack/new/mistral/contrib/devstack diff --git a/functionaltests/run_tests.sh b/functionaltests/run_tests.sh index 959642b03..20b6b364c 100755 --- a/functionaltests/run_tests.sh +++ b/functionaltests/run_tests.sh @@ -1,12 +1,12 @@ #!/bin/bash -source ./run_tests_common.sh +. ./run_tests_common.sh MURANO_ROOT=/opt/stack/new/murano/murano # Using .venv for tempest installation pushd $TEMPEST_DIR python "$MURANO_ROOT/tools/install_venv.py" -source "$MURANO_ROOT/.venv/bin/activate" +. "$MURANO_ROOT/.venv/bin/activate" pip install nose nosetests -sv "$MURANO_ROOT/tests/functional/api/v1" RETVAL=$? diff --git a/functionaltests/run_tests_congress_mistral.sh b/functionaltests/run_tests_congress_mistral.sh index 953735bda..539c7e05d 100755 --- a/functionaltests/run_tests_congress_mistral.sh +++ b/functionaltests/run_tests_congress_mistral.sh @@ -1,6 +1,6 @@ #!/bin/bash -source ./run_tests_common.sh +. ./run_tests_common.sh # Add tempest source tree to PYTHONPATH export PYTHONPATH=$PYTHONPATH:$TEMPEST_DIR