Move tests into openstack_requirements.

There's no reason to have this project be a special snowflake, lets
use the convention we do elsewhere in OpenStack.

Change-Id: I6ee4cbaa958dcc9c1018dbfdfda083dcb07eea00
This commit is contained in:
Robert Collins 2015-06-08 16:05:55 +12:00
parent 23ce13f375
commit 41abe54de4
16 changed files with 20 additions and 14 deletions

View File

@ -2,7 +2,7 @@
test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \ test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \ OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \ OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
${PYTHON:-python} -m subunit.run discover -t ./ ./ $LISTOPT $IDOPTION ${PYTHON:-python} -m subunit.run discover -t ./ openstack_requirements/ $LISTOPT $IDOPTION
test_id_option=--load-list $IDFILE test_id_option=--load-list $IDFILE
test_list_option=--list test_list_option=--list

View File

View File

@ -49,18 +49,23 @@ class Project(fixtures.Fixture):
project_fixture = Project( project_fixture = Project(
"tests/files/project.txt", "openstack_requirements/tests/files/project.txt",
"tests/files/setup.py", "tests/files/setup.cfg", "openstack_requirements/tests/files/setup.py",
"tests/files/test-project.txt") "openstack_requirements/tests/files/setup.cfg",
"openstack_requirements/tests/files/test-project.txt")
bad_project_fixture = Project( bad_project_fixture = Project(
"tests/files/project-with-bad-requirement.txt", "tests/files/setup.py", "openstack_requirements/tests/files/project-with-bad-requirement.txt",
"tests/files/setup.cfg") "openstack_requirements/tests/files/setup.py",
"openstack_requirements/tests/files/setup.cfg")
oslo_fixture = Project( oslo_fixture = Project(
"tests/files/project-with-oslo-tar.txt", "tests/files/old-setup.py", "openstack_requirements/tests/files/project-with-oslo-tar.txt",
"tests/files/setup.cfg") "openstack_requirements/tests/files/old-setup.py",
"openstack_requirements/tests/files/setup.cfg")
pbr_fixture = Project( pbr_fixture = Project(
"tests/files/project.txt", "tests/files/setup.py", "openstack_requirements/tests/files/project.txt",
"tests/files/pbr_setup.cfg", "tests/files/test-project.txt") "openstack_requirements/tests/files/setup.py",
"openstack_requirements/tests/files/pbr_setup.cfg",
"openstack_requirements/tests/files/test-project.txt")
class GlobalRequirements(fixtures.Fixture): class GlobalRequirements(fixtures.Fixture):
@ -69,4 +74,5 @@ class GlobalRequirements(fixtures.Fixture):
super(GlobalRequirements, self).setUp() super(GlobalRequirements, self).setUp()
self.root = self.useFixture(fixtures.TempDir()).path self.root = self.useFixture(fixtures.TempDir()).path
self.req_file = os.path.join(self.root, "global-requirements.txt") self.req_file = os.path.join(self.root, "global-requirements.txt")
shutil.copy("tests/files/gr-base.txt", self.req_file) shutil.copy(
"openstack_requirements/tests/files/gr-base.txt", self.req_file)

View File

@ -19,7 +19,7 @@ import StringIO
import fixtures import fixtures
import testtools import testtools
from tests import common from openstack_requirements.tests import common
import update import update

View File

@ -20,7 +20,7 @@ from __future__ import print_function
import testtools import testtools
from tests import common from openstack_requirements.tests import common
import update import update

View File

@ -16,7 +16,7 @@ from __future__ import print_function
import testtools import testtools
from tests import common from openstack_requirements.tests import common
import update import update