mirror of
				https://github.com/ARM-software/workload-automation.git
				synced 2025-11-04 09:02:12 +00:00 
			
		
		
		
	workloads/apache: fix for Python 3
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:
		
				
					committed by
					
						
						Marc Bonnici
					
				
			
			
				
	
			
			
			
						parent
						
							d4aad394d7
						
					
				
				
					commit
					3c0f1968c5
				
			@@ -1,6 +1,10 @@
 | 
			
		||||
from __future__ import division
 | 
			
		||||
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.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.'
 | 
			
		||||
            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()
 | 
			
		||||
        if code != 200:
 | 
			
		||||
            msg = 'HTTP request failed with status {}; is Apache running on target?'
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user