Merge "Remove six usage tests/functional"
This commit is contained in:
commit
1971be3402
|
@ -12,16 +12,16 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
from http import server as SimpleHTTPServer
|
||||||
import json
|
import json
|
||||||
import multiprocessing
|
import multiprocessing
|
||||||
import os
|
import os
|
||||||
import shutil
|
import shutil
|
||||||
|
import socketserver
|
||||||
import tempfile
|
import tempfile
|
||||||
import time
|
import time
|
||||||
|
|
||||||
from oslo_utils import uuidutils
|
from oslo_utils import uuidutils
|
||||||
from six.moves import SimpleHTTPServer
|
|
||||||
from six.moves import socketserver
|
|
||||||
from tempest.lib.cli import output_parser
|
from tempest.lib.cli import output_parser
|
||||||
from tempest.lib import exceptions
|
from tempest.lib import exceptions
|
||||||
|
|
||||||
|
|
|
@ -12,9 +12,9 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
import configparser
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from six.moves import configparser
|
|
||||||
from tempest.lib.cli import base
|
from tempest.lib.cli import base
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue