summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhurong <aaronzhu1121@gmail.com>2018-10-23 18:49:26 +0800
committerzhurong <aaronzhu1121@gmail.com>2018-10-23 18:49:26 +0800
commit18b276ecdfa073111e4f4a09c0af72434bdf2a51 (patch)
tree9a6979fbe512505d54dff3e173343f20ad9125ab
parent74c3a3e4b9c79ece9b7a414acd5c0f7650cf1c13 (diff)
Fix python3 compatible use sixHEADmaster
Notes
Notes (review): Code-Review+2: zhurong <aaronzhu1121@gmail.com> Workflow+1: zhurong <aaronzhu1121@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 24 Oct 2018 01:06:40 +0000 Reviewed-on: https://review.openstack.org/612662 Project: openstack/murano-dashboard Branch: refs/heads/master
-rw-r--r--muranodashboard/tests/functional/sanity_check.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/muranodashboard/tests/functional/sanity_check.py b/muranodashboard/tests/functional/sanity_check.py
index 10a9638..2ecbf49 100644
--- a/muranodashboard/tests/functional/sanity_check.py
+++ b/muranodashboard/tests/functional/sanity_check.py
@@ -10,18 +10,19 @@
10# License for the specific language governing permissions and limitations 10# License for the specific language governing permissions and limitations
11# under the License. 11# under the License.
12 12
13from http.server import BaseHTTPRequestHandler
14import multiprocessing 13import multiprocessing
15import os 14import os
16import re 15import re
17import shutil 16import shutil
18import socketserver
19import tempfile 17import tempfile
20import time 18import time
21import unittest 19import unittest
22import uuid 20import uuid
23import zipfile 21import zipfile
24 22
23from six.moves import SimpleHTTPServer
24from six.moves import socketserver
25
25from selenium.common import exceptions 26from selenium.common import exceptions
26from selenium.webdriver.common import by 27from selenium.webdriver.common import by
27from selenium.webdriver.common.keys import Keys 28from selenium.webdriver.common.keys import Keys
@@ -2765,7 +2766,7 @@ class TestSuiteRepository(base.PackageTestCase):
2765 self.serve_dir = tempfile.mkdtemp(suffix="repo") 2766 self.serve_dir = tempfile.mkdtemp(suffix="repo")
2766 2767
2767 def serve_function(): 2768 def serve_function():
2768 class Handler(BaseHTTPRequestHandler): 2769 class Handler(SimpleHTTPServer.SimpleHTTPRequestHandler):
2769 pass 2770 pass
2770 os.chdir(self.serve_dir) 2771 os.chdir(self.serve_dir)
2771 httpd = socketserver.TCPServer( 2772 httpd = socketserver.TCPServer(