From 5aa5a084e6f300a867a7746b4c150140e8c283ef Mon Sep 17 00:00:00 2001 From: bria4010 Date: Fri, 10 Jun 2016 18:27:58 -0400 Subject: [PATCH] Corrected testing apparatus This commit changes the name of the directory where the python test code lives so that it is a legal python identifier (no dashes) and propagates the name change out to all appropriate files. Additionally, the 'pypy' environment is removed from the default environments in tox.ini and the 'docs' environment is added as a default (since creating the user story docs is the whole point of this repo). The single test that's there still doesn't do anything, but at least the framework is correct for when tests are added. Change-Id: Iacf17ac58e62b67be633c77ea95f6a82d25e7d5a --- openstack-common.conf | 2 +- .../__init__.py | 2 +- .../tests/__init__.py | 0 .../tests/base.py | 0 .../tests/test_openstack_user_stories.py | 8 ++++---- setup.cfg | 2 +- tox.ini | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename {openstack-user-stories => openstack_user_stories}/__init__.py (93%) rename {openstack-user-stories => openstack_user_stories}/tests/__init__.py (100%) rename {openstack-user-stories => openstack_user_stories}/tests/base.py (100%) rename openstack-user-stories/tests/test_openstack-user-stories.py => openstack_user_stories/tests/test_openstack_user_stories.py (79%) diff --git a/openstack-common.conf b/openstack-common.conf index 8f58057..3073d2e 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -3,4 +3,4 @@ # The list of modules to copy from oslo-incubator.git # The base module to hold the copy of openstack.common -base=openstack-user-stories +base=openstack_user_stories diff --git a/openstack-user-stories/__init__.py b/openstack_user_stories/__init__.py similarity index 93% rename from openstack-user-stories/__init__.py rename to openstack_user_stories/__init__.py index 4e58cbd..83f621c 100644 --- a/openstack-user-stories/__init__.py +++ b/openstack_user_stories/__init__.py @@ -16,4 +16,4 @@ import pbr.version __version__ = pbr.version.VersionInfo( - 'openstack-user-stories').version_string() + 'openstack_user_stories').version_string() diff --git a/openstack-user-stories/tests/__init__.py b/openstack_user_stories/tests/__init__.py similarity index 100% rename from openstack-user-stories/tests/__init__.py rename to openstack_user_stories/tests/__init__.py diff --git a/openstack-user-stories/tests/base.py b/openstack_user_stories/tests/base.py similarity index 100% rename from openstack-user-stories/tests/base.py rename to openstack_user_stories/tests/base.py diff --git a/openstack-user-stories/tests/test_openstack-user-stories.py b/openstack_user_stories/tests/test_openstack_user_stories.py similarity index 79% rename from openstack-user-stories/tests/test_openstack-user-stories.py rename to openstack_user_stories/tests/test_openstack_user_stories.py index 54cb7d3..a99e379 100644 --- a/openstack-user-stories/tests/test_openstack-user-stories.py +++ b/openstack_user_stories/tests/test_openstack_user_stories.py @@ -13,16 +13,16 @@ # under the License. """ -test_openstack-user-stories +test_openstack_user_stories ---------------------------------- -Tests for `openstack-user-stories` module. +Tests for `openstack_user_stories` module. """ -from openstack-user-stories.tests import base +from openstack_user_stories.tests import base -class TestOpenstack-user-stories(base.TestCase): +class TestOpenstack_user_stories(base.TestCase): def test_something(self): pass diff --git a/setup.cfg b/setup.cfg index 0185bf8..34b7dec 100644 --- a/setup.cfg +++ b/setup.cfg @@ -21,7 +21,7 @@ classifier = [files] packages = - openstack-user-stories + openstack_user_stories [build_sphinx] source-dir = doc/source diff --git a/tox.ini b/tox.ini index 54fdd6a..d6530cf 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 1.6 -envlist = py34,py27,pypy,pep8 +envlist = py34,py27,pep8,docs skipsdist = True [testenv]