diff options
| author | Matthew Treinish <mtreinish@kortar.org> | 2014-11-17 18:11:56 -0500 |
|---|---|---|
| committer | Matthew Treinish <mtreinish@kortar.org> | 2014-11-18 21:49:30 -0500 |
| commit | 2474f41f10808c7283778b96f8693238ea21297f (patch) | |
| tree | 685bf0af90ef0db96efb1cc2d9dc85b8bac25817 /requirements.txt | |
| parent | 88f7d3379333e03b1170a02ec75f316fbc2817a5 (diff) | |
| download | tempest-2474f41f10808c7283778b96f8693238ea21297f.tar.gz | |
Fix inheritance for BaseTestCase
This commit fixes the inheritance around the BaseTestCase definition.
Previously there were a couple of things wrong with it, first the
mixin order was incorrect, secondly the use of ResourcedTestCase
wasn't actually needed since testresources isn't actually used
anywhere. The other part of the fix was the hack for python2.6 to
also add unittest2 to BaseTestCase is not needed now, because
testtools now uses unittest2.
As a part of this fix the base CLI test class has to be reworked to
change how tempest-lib is used. By fixing the inheritance on
BaseTestCase a conflict occurs with the class test used from
tempest-lib. The recommended usage pattern for tempest-lib will have
to be rethought. But, in the mean time this commit just adds the code
which would be inherited from the mixin in tempest-lib directly. It
should be removed when tempest-lib is updated to accommodate this use
case.
Change-Id: Ia5dda59f7989f37997276cbd19bb9fdc7b7d2624
Diffstat (limited to 'requirements.txt')
| -rw-r--r-- | requirements.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/requirements.txt b/requirements.txt index ac7201742..4a889a8e5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,6 @@ python-heatclient>=0.2.9 python-ironicclient>=0.2.1 python-saharaclient>=0.7.3 python-swiftclient>=2.2.0 -testresources>=0.2.4 testrepository>=0.0.18 oslo.config>=1.4.0 # Apache-2.0 six>=1.7.0 |