Cleaning up chrome launcher, multiple instance support

windmill/browser/chrome.py

@@ -30,108 +30,24 @@
 logger = logging.getLogger(__name__)
 
 import safari
-
-def getoutput(l):
-    tmp = tempfile.mktemp()
-    x = open(tmp, 'w')
-    subprocess.call(l, stdout=x, stderr=x)
-    x.close(); x = open(tmp, 'r')
-    r = x.read() ; x.close()
-    os.remove(tmp)
-    return r
-
-def find_default_interface_name():
-    if windmill.settings['NETWORK_INTERFACE_NAME'] is not None:
-        return windmill.settings['NETWORK_INTERFACE_NAME']
-    target_host = urlparse.urlparse(windmill.settings['TEST_URL']).hostname
-    x = ['/sbin/route', 'get', target_host]
-    interface_id = [l for l in getoutput(x).splitlines() if 'interface' in l][0].split(":")[-1].strip()
-    all_inet = getoutput([windmill.settings['NETWORKSETUP_BINARY'], '-listallhardwareports']).splitlines()
-    try:
-        i = all_inet.index([l for l in all_inet if 'Device: '+interface_id in l][0])
-        interface_name = all_inet[i - 1].split(':')[-1].strip()
-
-        # interface_name = [ l for l in all_inet if l.find(interface_id) is not -1 ][0].split('\n')[0].split(':')[-1]
-        # if interface_name[0] == ' ':
-        #     interface_name = interface_name.strip()
-        # if interface_name[-1] == ' ':
-        #     interface_name = interface_name.rstrip()
-    except IndexError:
-        print "ERROR: Cannot figure out interface name, please set NETWORK_INTERFACE_NAME in local settings file"
-        from windmill.bin import admin_lib
-        admin_lib.teardown(admin_lib.shell_objects_dict)
-        sys.exit()
-
-    # interfaces = getoutput().split('\n\n')
-    # print 'interfaces::\n', '\n'.join(interfaces)
-    # for line in interfaces:
-    #     if not line.startswith('(') and line.find('(1)') is not -1:
-    #         line = '(1)'+line.split('(1)')[-1]
-    #     if line.find('Device: '+interface) is not -1:
-    #         interface_name = ' '.join(line.splitlines()[0].split()[1:])
-
-    return interface_name
 
 class Chrome(safari.Safari):
 
     def __init__(self):
         self.chrome_binary = windmill.settings['CHROME_BINARY']
         self.test_url = windmill.settings['TEST_URL']
 
-    # def create_redirect(self):
-    #     self.redirection_page = tempfile.mktemp(suffix='.html')
-    #     f = open(self.redirection_page, 'w') 
-    #     test_url = windmill.get_test_url(windmill.settings['TEST_URL']) 
-    #     f.write( html_redirection.replace('{replace}', test_url) )
-    #     f.flush() ; f.close()
-
-    def set_proxy_mac(self):
-        """Set local Proxy"""
-        self.netsetup_binary = windmill.settings['NETWORKSETUP_BINARY']
-        interface_name = find_default_interface_name()
-        uri = urlparse.urlparse(self.test_url)
-        set_proxy_command = ' '.join([ self.netsetup_binary, 
-                                       '-setwebproxy', 
-                                       '"'+interface_name+'"', 
-                                       '127.0.0.1', 
-                                       str(windmill.settings['SERVER_HTTP_PORT'])
-                                     ])
-        commands.getoutput(set_proxy_command)
-        enable_proxy_command = ' '.join([ self.netsetup_binary,
-                                          '-setwebproxystate',
-                                          '"'+interface_name+'"',
-                                          'on'
-                                        ])
-        commands.getoutput(enable_proxy_command)      
-        self.create_redirect()
-        self.interface_name = interface_name
-
     def unset_proxy_mac(self):
         commands.getoutput(' '.join([self.netsetup_binary, '-setwebproxystate', '"'+self.interface_name+'"', 'off']))
 
     def get_chrome_command(self):
-        #default options, what was used for windows chrome build
-        chrome_options = ['--temp-profile', '--disable-popup-blocking', '--no-first-run', '--homepage', self.test_url+'/windmill-serv/start.html']
-        if sys.platform in ('cygwin', 'win32','linux2'):
-            # options for running in windows and linux (same options format)
-            # Run Proxy using option
-            chrome_options = ['--temp-profile', '--disable-popup-blocking', '--no-first-run', '--proxy-server='+'127.0.0.1:'+str(windmill.settings['SERVER_HTTP_PORT']), '--homepage', self.test_url+'/windmill-serv/start.html']
-        return [self.chrome_binary]+chrome_options
-
-    #def set_proxy_windows(self):
-    #    import ie
-    #    self.ie_obj = ie.InternetExplorer()
-    #    self.ie_obj.set_proxy()
-    # 
-    # def unset_proxy_windows(self):
-    #     self.ie_obj.unset_proxy()
+        tmp_profile = tempfile.mkdtemp(suffix='.mozrunner')
 
+        chrome_options = ["--user-data-dir="+tmp_profile,'--temp-profile', '--disable-popup-blocking', '--no-first-run', '--proxy-server='+'127.0.0.1:'+str(windmill.settings['SERVER_HTTP_PORT']), '--homepage', self.test_url+'/windmill-serv/start.html']
+        return [self.chrome_binary]+chrome_options
+
     def start(self):
         """Start Chrome"""
-        if sys.platform == 'darwin':
-             self.set_proxy_mac()
-        #if sys.platform in ('cygwin', 'win32'):
-        #    self.set_proxy_windows()
 
         # Workaround for bug in nose
         if hasattr(sys.stdout, 'fileno'):
@@ -147,21 +63,7 @@ def kill(self, kill_signal=None):
         """Stop Chrome"""
         if sys.version < '2.6':
             raise Exception("Kill doesn't work for Chrome on Python version pre-2.6")
-        if sys.platform == 'darwin':
-	        self.unset_proxy_mac()
-        #if sys.platform in ('cygwin', 'win32'):
-        #    self.unset_proxy_windows()
-        #    
         try:
             self.p_handle.kill()
         except:
-            logger.exception('Cannot kill Chrome')
-
-    # def stop(self):
-    #     self.kill(signal.SIGTERM)
-    #         
-    # def is_alive(self):
-    #     if self.p_handle.poll() is None:
-    #         return False
-    #     return True
-
+            logger.exception('Cannot kill Chrome')