From c3eceeff18976dd27e3e0db9028e40fd9a3074ef Mon Sep 17 00:00:00 2001 From: Yaroslav Lobankov Date: Tue, 8 Apr 2014 17:15:07 +0400 Subject: [PATCH] Cleanup of docs for integration tests Some parts of text from https://github.com/openstack/sahara/blob/master/sahara/tests/integration/README.rst are displayed not correctly. This patch corrects that. Change-Id: Iec7b6b51530d96739f640a3fdfe1e894a67ed4a9 (cherry picked from commit 1fa25cd90a4997cc01356dd51b3d2d9bd31e1fbd) --- sahara/tests/integration/README.rst | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sahara/tests/integration/README.rst b/sahara/tests/integration/README.rst index 6d77025bc1..ccca8db9d1 100644 --- a/sahara/tests/integration/README.rst +++ b/sahara/tests/integration/README.rst @@ -22,11 +22,8 @@ In this case all tests will be launched except disabled tests. Tests can be disabled in the ``/sahara/tests/integration/configs/config.py`` file or in the ``/sahara/tests/integration/configs/itest.conf``. -.. note:: - - Both ``OS_TENANT_ID`` and ``OS_TENANT_NAME`` must be specified in the - config file. -.. +**NOTE:** Both ``OS_TENANT_ID`` and ``OS_TENANT_NAME`` must be specified in the +config file. If you want to run integration tests for one plugin, you should use the corresponding tox env: @@ -66,11 +63,13 @@ this case you should use the following tox env: Here are a few more examples. -* ``tox -e integration -- transient`` will run test for transient cluster. In +``tox -e integration -- transient`` will run test for transient cluster. In this case cluster will be created via the Vanilla plugin with the Hadoop version 1.2.1. More info about transient cluster see in section ``Contents``. -* ``tox -e integration -- hdp`` will run tests for the HDP plugin. -* ``tox -e integration -- transient vanilla2 idh2`` will run test for transient + +``tox -e integration -- hdp`` will run tests for the HDP plugin. + +``tox -e integration -- transient vanilla2 idh2`` will run test for transient cluster, tests for the Vanilla plugin with the Hadoop version 1.2.1 and tests for the IDH plugin with the Intel Hadoop version 2.5.1.