From 573c39acf5b927af0f61b163a8d196ad5fdb2902 Mon Sep 17 00:00:00 2001 From: Alexey Stepanov Date: Thu, 24 Mar 2016 15:30:27 +0300 Subject: [PATCH] Fix docs tests 1. Indention of docstrings 2. Moved modules 3. Deleted duplicates Change-Id: Ie77f8a123c419c7e42bfe7d888a8f90dc0c6bcf4 Closes-bug: #1561506 --- doc/base_tests.rst | 23 ++++-------- doc/system_tests.rst | 13 +++---- fuelweb_test/tests/test_multiple_networks.py | 21 +++++------ .../tests/test_services_reconfiguration.py | 36 +++++++++---------- 4 files changed, 40 insertions(+), 53 deletions(-) diff --git a/doc/base_tests.rst b/doc/base_tests.rst index 44f8a00bf..8391cc447 100644 --- a/doc/base_tests.rst +++ b/doc/base_tests.rst @@ -294,7 +294,7 @@ Test Ubuntu bootstrap Test Ubuntu Cloud Archive ------------------------- -.. automodule:: fuelweb_test.tests.test_uca +.. automodule:: fuelweb_test.tests.tests_uca.test_uca :members: Test Vcenter @@ -342,22 +342,22 @@ Test Fuel agent Test Fuel cli ------------- -.. automodule:: gates_tests.test_review_in_fuel_client +.. automodule:: gates_tests.tests.test_review_in_fuel_client :members: Test Fuel astute ---------------- -.. automodule:: gates_tests.test_review_in_astute +.. automodule:: gates_tests.tests.test_review_in_astute :members: Test Fuel nailgun agent ----------------------- -.. automodule:: gates_tests.test_nailgun_agent +.. automodule:: gates_tests.tests.test_nailgun_agent :members: Test Fuel web ------------- -.. automodule:: gates_tests.test_review_fuel_web +.. automodule:: gates_tests.tests.test_review_fuel_web :members: Fuel mirror verification @@ -477,11 +477,6 @@ Example tests .. automodule:: fuelweb_test.tests.plugins.plugin_example.test_fuel_plugin_example :members: -Example post deploy plugin install ----------------------------------- -.. automodule:: fuelweb_test.tests.plugins.plugin_example.test_fuel_plugin_example_postdeploy - :members: - Example tests for plugin installation after cluster create ---------------------------------------------------------- .. automodule:: fuelweb_test.tests.plugins.plugin_example.test_fuel_plugin_example_postdeploy @@ -541,7 +536,7 @@ Security tests Nessus scan tests ----------------- -.. automodule:: fuelweb_test.tests.tests_security_test_run_nessus +.. automodule:: fuelweb_test.tests.tests_security.test_run_nessus :members: @@ -677,11 +672,7 @@ Deployment with platform components .. automodule:: fuelweb_test.tests.tests_separate_services.test_deploy_platform_components :members: -Template based tests --------------------- -.. automodule:: fuelweb_test.actions_tests - Test for ssl components ----------------------- .. automodule:: fuelweb_test.tests.test_ssl - :members: \ No newline at end of file + :members: diff --git a/doc/system_tests.rst b/doc/system_tests.rst index b33a81366..94fb90eee 100644 --- a/doc/system_tests.rst +++ b/doc/system_tests.rst @@ -83,17 +83,17 @@ Deploy cluster and check RadosGW :members: Delete cluster after deploy --------------------------------- +--------------------------- .. automodule:: system_test.tests.test_delete_after_deploy :members: Redeploy cluster after stop --------------------------------- +--------------------------- .. automodule:: system_test.tests.test_redeploy_after_stop :members: Redeploy cluster after reset --------------------------------- +---------------------------- .. automodule:: system_test.tests.test_redeploy_after_reset :members: @@ -107,7 +107,7 @@ Strength tests Destroy controllers ------------------- -.. automodule:: system_test.tests.strength.destroy_controllers +.. automodule:: system_test.tests.strength.test_destroy_controllers :members: Fill root and check pacemaker @@ -118,11 +118,6 @@ Fill root and check pacemaker Plugin tests ============ -Plugins Base ------------- -.. automodule:: system_test.tests.plugins_actions - :members: - Example plugin Base ------------------- .. automodule:: system_test.tests.plugins.plugin_example diff --git a/fuelweb_test/tests/test_multiple_networks.py b/fuelweb_test/tests/test_multiple_networks.py index b588b25a2..28db08bac 100644 --- a/fuelweb_test/tests/test_multiple_networks.py +++ b/fuelweb_test/tests/test_multiple_networks.py @@ -350,16 +350,17 @@ class TestMultipleClusterNets(TestBasic): """Add new nodegroup to operational environment Scenario: - 1. Revert snapshot with operational cluster - 2. Create new nodegroup for the environment and configure its networks - 3. Bootstrap slave node from custom-2 nodegroup - 4. Add node from new nodegroup to the environment with compute role - 5. Run network verification - 6. Deploy changes - 7. Run network verification - 8. Run OSTF - 9. Check that nodes from 'default' nodegroup can reach nodes - from new nodegroup via management and storage networks + 1. Revert snapshot with operational cluster + 2. Create new nodegroup for the environment and configure + it's networks + 3. Bootstrap slave node from custom-2 nodegroup + 4. Add node from new nodegroup to the environment with compute role + 5. Run network verification + 6. Deploy changes + 7. Run network verification + 8. Run OSTF + 9. Check that nodes from 'default' nodegroup can reach nodes + from new nodegroup via management and storage networks Duration 50m Snapshot add_custom_nodegroup diff --git a/fuelweb_test/tests/test_services_reconfiguration.py b/fuelweb_test/tests/test_services_reconfiguration.py index 81e54e9e4..b52ad3e85 100644 --- a/fuelweb_test/tests/test_services_reconfiguration.py +++ b/fuelweb_test/tests/test_services_reconfiguration.py @@ -981,24 +981,24 @@ class ServicesReconfiguration(TestBasic): """Deploy two clusters with different configs Scenario: - 1. Revert snapshot "ready_with_5_slaves" - 2. Divided the IP ranges into two parts - 3. Verify network of the first environment - 4. Verify network of the second environment - 5. Deploy environment with first ranges - 6. Run OSTF on the first environment - 7. Deploy environment with second ranges - 8. Run OSTF on the second environment - 9. Apply new CPU overcommit ratio for first environment - 10. Verify deployment task is finished - 11. Verify nova-scheduler services uptime - 12. Verify configuration file on controller - 13. Boot instances with flavor that occupy all CPU, - boot extra instance and catch the error - 14. Apply old CPU overcommit ratio for each controller - 15. Verify deployment task is finished - 16. Verify nova-scheduler services uptime - 17. Verify configuration file on each controller + 1. Revert snapshot "ready_with_5_slaves" + 2. Divided the IP ranges into two parts + 3. Verify network of the first environment + 4. Verify network of the second environment + 5. Deploy environment with first ranges + 6. Run OSTF on the first environment + 7. Deploy environment with second ranges + 8. Run OSTF on the second environment + 9. Apply new CPU overcommit ratio for first environment + 10. Verify deployment task is finished + 11. Verify nova-scheduler services uptime + 12. Verify configuration file on controller + 13. Boot instances with flavor that occupy all CPU, + boot extra instance and catch the error + 14. Apply old CPU overcommit ratio for each controller + 15. Verify deployment task is finished + 16. Verify nova-scheduler services uptime + 17. Verify configuration file on each controller Snapshot "two_clusters_reconfiguration"