Skip to content

Commit

Permalink
Remove Whitebox tests
Browse files Browse the repository at this point in the history
This commit removes the whitebox tests from tempest. The proper place
for this type of testing is in nova unit tests not in tempest.

Fixes bug 1222852

Change-Id: I0fac7b030c51985f9d6d93129bf9bab75c18cd11
  • Loading branch information
Matthew Treinish committed Sep 12, 2013
1 parent bfcc712 commit de8378b
Show file tree
Hide file tree
Showing 12 changed files with 1 addition and 610 deletions.
1 change: 0 additions & 1 deletion doc/source/field_guide/whitebox.rst

This file was deleted.

1 change: 0 additions & 1 deletion doc/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ where your test contributions should go.
field_guide/scenario
field_guide/stress
field_guide/thirdparty
field_guide/whitebox
field_guide/unit_tests

------------------
Expand Down
23 changes: 0 additions & 23 deletions etc/tempest.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -161,29 +161,6 @@ flavor_extra_enabled = true
# Expected first device name when a volume is attached to an instance
volume_device_name = vdb

[whitebox]
# Whitebox options for compute. Whitebox options enable the
# whitebox test cases, which look at internal Nova database state,
# SSH into VMs to check instance state, etc.

# Should we run whitebox tests for Compute?
whitebox_enabled = true

# Path of nova source directory
source_dir = /opt/stack/nova

# Path of nova configuration file
config_path = /etc/nova/nova.conf

# Directory containing nova binaries such as nova-manage
bin_dir = /usr/local/bin

# Connection string to the database of Compute service
db_uri = mysql://nova:secret@localhost/nova

# Path to a private key file for SSH access to remote hosts
path_to_private_key = /home/user/.ssh/id_rsa

[compute-admin]
# This should be the username of a user WITH administrative privileges
# If not defined the admin user from the identity section will be used
Expand Down
2 changes: 0 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,4 @@ testresources>=0.2.4
keyring>=1.6.1
testrepository>=0.0.17
oslo.config>=1.1.0
# Needed for whitebox testing
SQLAlchemy>=0.7.8,<=0.7.99
eventlet>=0.13.0
4 changes: 1 addition & 3 deletions run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ function usage {
echo " -f, --force Force a clean re-build of the virtual environment. Useful when dependencies have been added."
echo " -u, --update Update the virtual environment with any newer package versions"
echo " -s, --smoke Only run smoke tests"
echo " -w, --whitebox Only run whitebox tests"
echo " -t, --serial Run testr serially"
echo " -c, --nova-coverage Enable Nova coverage collection"
echo " -C, --config Config file location"
Expand Down Expand Up @@ -38,7 +37,7 @@ update=0
logging=0
logging_config=etc/logging.conf

if ! options=$(getopt -o VNnfuswtcphdC:lL: -l virtual-env,no-virtual-env,no-site-packages,force,update,smoke,whitebox,serial,nova-coverage,pep8,help,debug,config:,logging,logging-config: -- "$@")
if ! options=$(getopt -o VNnfustcphdC:lL: -l virtual-env,no-virtual-env,no-site-packages,force,update,smoke,serial,nova-coverage,pep8,help,debug,config:,logging,logging-config: -- "$@")
then
# parse error
usage
Expand All @@ -60,7 +59,6 @@ while [ $# -gt 0 ]; do
-C|--config) config_file=$2; shift;;
-p|--pep8) let just_pep8=1;;
-s|--smoke) testrargs="$testrargs smoke";;
-w|--whitebox) testrargs="$testrargs whitebox";;
-t|--serial) serial=1;;
-l|--logging) logging=1;;
-L|--logging-config) logging_config=$2; shift;;
Expand Down
9 changes: 0 additions & 9 deletions tempest/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ to make this clear.
| scenario/ - complex scenario tests
| stress/ - stress tests
| thirdparty/ - 3rd party api tests
| whitebox/ - white box testing
Each of these directories contains different types of tests. What
belongs in each directory, the rules and examples for good tests, are
Expand Down Expand Up @@ -78,11 +77,3 @@ Many openstack components include 3rdparty API support. It is
completely legitimate for Tempest to include tests of 3rdparty APIs,
but those should be kept separate from the normal OpenStack
validation.


whitebox
--------

Whitebox tests are tests which require access to the database of the
target OpenStack machine to verify internal state after operations
are made. White box tests are allowed to use the python clients.
32 changes: 0 additions & 32 deletions tempest/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -238,36 +238,6 @@ def register_compute_admin_opts(conf):
for opt in ComputeAdminGroup:
conf.register_opt(opt, group='compute-admin')


whitebox_group = cfg.OptGroup(name='whitebox',
title="Whitebox Options")

WhiteboxGroup = [
cfg.BoolOpt('whitebox_enabled',
default=False,
help="Does the test environment support whitebox tests for "
"Compute?"),
cfg.StrOpt('db_uri',
default=None,
help="Connection string to the database of Compute service"),
cfg.StrOpt('source_dir',
default="/opt/stack/nova",
help="Path of nova source directory"),
cfg.StrOpt('config_path',
default='/etc/nova/nova.conf',
help="Path of nova configuration file"),
cfg.StrOpt('bin_dir',
default="/usr/local/bin/",
help="Directory containing nova binaries such as nova-manage"),
]


def register_whitebox_opts(conf):
conf.register_group(whitebox_group)
for opt in WhiteboxGroup:
conf.register_opt(opt, group='whitebox')


image_group = cfg.OptGroup(name='image',
title="Image Service Options")

Expand Down Expand Up @@ -650,7 +620,6 @@ def __init__(self):

register_compute_opts(cfg.CONF)
register_identity_opts(cfg.CONF)
register_whitebox_opts(cfg.CONF)
register_image_opts(cfg.CONF)
register_network_opts(cfg.CONF)
register_volume_opts(cfg.CONF)
Expand All @@ -663,7 +632,6 @@ def __init__(self):
register_scenario_opts(cfg.CONF)
register_service_available_opts(cfg.CONF)
self.compute = cfg.CONF.compute
self.whitebox = cfg.CONF.whitebox
self.identity = cfg.CONF.identity
self.images = cfg.CONF.image
self.network = cfg.CONF.network
Expand Down
46 changes: 0 additions & 46 deletions tempest/whitebox/README.rst

This file was deleted.

Empty file removed tempest/whitebox/__init__.py
Empty file.
146 changes: 0 additions & 146 deletions tempest/whitebox/manager.py

This file was deleted.

0 comments on commit de8378b

Please sign in to comment.