sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-01-31 02:01:16 +00:00
Code Issues Releases Wiki Activity

workloads/apache: fix for Python 3

Browse Source 
urllib2 does not exist in Python 3, and its methods have been moved into
urllib.request. Use future library to create aliases that work across
both 2 and 3.
This commit is contained in:
Sergei Trofimov 2018-06-26 08:27:08 +01:00 committed by Marc Bonnici
parent d4aad394d7
commit 3c0f1968c5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wa/workloads/apache.py
View File

@ -1,6 +1,10 @@
from __future__ import division from __future__ import division
import os import os
import urllib2
from future.standard_library import install_aliases
install_aliases()
from urllib.request import urlopen
from wa import Workload, Parameter, Alias, WorkloadError from wa import Workload, Parameter, Alias, WorkloadError
from wa.utils.exec_control import once from wa.utils.exec_control import once
@ -55,7 +59,7 @@ class ApacheBenchmark(Workload):
msg = 'ab not found on host; make sure apache2-utils (or you distro equivalent) package is installed.' msg = 'ab not found on host; make sure apache2-utils (or you distro equivalent) package is installed.'
raise WorkloadError(msg) raise WorkloadError(msg)
response = urllib2.urlopen('http://{}:{}{}'.format(self.target.conn.host, self.port, self.path)) response = urlopen('http://{}:{}{}'.format(self.target.conn.host, self.port, self.path))
code = response.getcode() code = response.getcode()
if code != 200: if code != 200:
msg = 'HTTP request failed with status {}; is Apache running on target?' msg = 'HTTP request failed with status {}; is Apache running on target?'