diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-14 14:59:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-14 14:59:30 +0000 |
| commit | bdad147707f62b229c7d78b70b9cf20e618a41dd (patch) | |
| tree | 1839ef5f317d0958345590eb8282a5d00c2ff46d | |
| parent | 3693ea2a63780e5ab792fcb14d0f4e73a6d8150d (diff) | |
| parent | 93ae60629d770951836f4bd52b4e9e71d70779aa (diff) | |
| download | python-barbicanclient-bdad147707f62b229c7d78b70b9cf20e618a41dd.tar.gz | |
Merge "Don't use tempest log"
| -rw-r--r-- | functionaltests/client/base.py | 2 | ||||
| -rw-r--r-- | functionaltests/client/v1/behaviors/base_behaviors.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/functionaltests/client/base.py b/functionaltests/client/base.py index f8a9f6b..e2284e6 100644 --- a/functionaltests/client/base.py +++ b/functionaltests/client/base.py @@ -13,6 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. """ +import logging import os import oslotest.base as oslotest @@ -20,7 +21,6 @@ from barbicanclient import client from keystoneclient.auth import identity from keystoneclient import session from tempest import config -from tempest.openstack.common import log as logging CONF = config.CONF diff --git a/functionaltests/client/v1/behaviors/base_behaviors.py b/functionaltests/client/v1/behaviors/base_behaviors.py index 7237d92..b8a913e 100644 --- a/functionaltests/client/v1/behaviors/base_behaviors.py +++ b/functionaltests/client/v1/behaviors/base_behaviors.py @@ -13,10 +13,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. """ +import logging import os -from tempest.openstack.common import log as logging - class BaseBehaviors(object): |