Merge "Don't use tempest log"

This commit is contained in:
Jenkins
2015-03-14 14:59:30 +00:00
committed by Gerrit Code Review
2 changed files with 2 additions and 3 deletions

View File

@@ -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

View File

@@ -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):