Move functional tests under muranodashboard/tests

This patch allows to run functional tests under devstack
Rename muranodashboard/test to muranodashboard/tests

Partly-Closes-Bug: #1349383
Change-Id: I70ac476cce9e037b8f36872dde3c1825ca6e3a04
This commit is contained in:
Ekaterina Fedorova 2014-07-28 15:14:45 +04:00
parent cbe16d3308
commit 97c7c806ef
17 changed files with 8 additions and 12 deletions

2
.gitignore vendored
View File

@ -23,4 +23,4 @@ dist
doc/source/api
# Tests
functionaltests/config/config_file.conf
muranodashboard/test/functional/config/config_file.conf

View File

@ -13,8 +13,8 @@ from selenium.webdriver.support.ui import WebDriverWait
import testtools
import config.config as cfg
from functionaltests import consts
from functionaltests import utils
from muranodashboard.tests.functional import consts
from muranodashboard.tests.functional import utils
log = logging.getLogger(__name__)
log.setLevel(logging.DEBUG)

View File

@ -1,13 +1,9 @@
import os
import sys
sys.path.append(os.getcwd())
from selenium.webdriver.common import by
from selenium.webdriver.support.ui import WebDriverWait
from functionaltests import base
from functionaltests import consts as c
from functionaltests import utils
from muranodashboard.tests.functional import base
from muranodashboard.tests.functional import consts as c
from muranodashboard.tests.functional import utils
class TestSuiteSmoke(base.UITestCase):

View File

@ -70,7 +70,7 @@ def screenshot_on_error(test):
@functools.wraps(test)
def wrapper(*args, **kwargs):
try:
log.debug("Executing test: '{0}'".format(test.func_name))
log.debug("\nExecuting test: '{0}'".format(test.func_name))
test(*args, **kwargs)
except Exception as e:
log.exception('{0} failed'.format(test.func_name))

View File

@ -17,7 +17,7 @@ deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
http://tarballs.openstack.org/horizon/horizon-master.tar.gz
commands = {toxinidir}/manage.py test muranodashboard --settings=muranodashboard.test.settings
commands = {toxinidir}/manage.py test muranodashboard --settings=muranodashboard.tests.settings
[testenv:pep8]
sitepackages = False