Hopefully the last round of fixes for IE launcher.

-Mikeal git-svn-id: http://svn.getwindmill.com/trunk@179 78c7df6f-8922-0410-bcd3-9426b1ad491b
windmill · Apr 30, 2007 · b01df56 · b01df56
1 parent ae25eb6
commit b01df56
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/windmill/browser/__init__.py b/windmill/browser/__init__.py
@@ -27,4 +27,6 @@ def get_firefox_controller():
 
 def get_ie_controller():
     import ie
-    browser = ie.InternetExplorer()
+    browser = ie.InternetExplorer()
+
+    return browser
diff --git a/windmill/browser/ie.py b/windmill/browser/ie.py
@@ -19,8 +19,7 @@ class InternetExplorer(object):
     registry_modifications = {'MigrateProxy': {'type': wreg.REG_DWORD, 'new_value':1},
                               'ProxyEnable':  {'type': wreg.REG_DWORD, 'new_value':1},
                               'ProxyHttp1.1': {'type': wreg.REG_DWORD, 'new_value':0},
-                              'ProxyServer':  {'type': wreg.REG_SZ},
-                              }
+                              'ProxyServer':  {'type': wreg.REG_SZ}}
 
     def __init__(self, proxy_port=PROXY_PORT, test_url=DEFAULT_TEST_URL, ie_binary=IE_BINARY):
 
@@ -30,32 +29,37 @@ def __init__(self, proxy_port=PROXY_PORT, test_url=DEFAULT_TEST_URL, ie_binary=I
         self.reg = wreg.OpenKey(wreg.HKEY_CURRENT_USER, 
                                 "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings", 0, wreg.KEY_ALL_ACCESS)
 
-        for key, value in self.registry_modifications:
+        for key, value in self.registry_modifications.items():
             try:
                 result = wreg.QueryValueEx(self.reg, key)
-                self.registry_modifications['previous_value'] = result[0]
+                self.registry_modifications[key]['previous_value'] = result[0]
             except exceptions.WindowsError:
-                self.registry_modifications['previous_value'] = None
-                wreg.CreateKey(self.reg, key)
+                self.registry_modifications[key]['previous_value'] = None
 
         self.cmd = [ie_binary, self.test_url]
 
 
 
     def start(self):
 
-        for key, value in self.registry_modifications:
+        for key, value in self.registry_modifications.items():
             wreg.SetValueEx(self.reg, key, 0, value['type'], value['new_value'])
+
+        allow_reg = wreg.OpenKey(wreg.HKEY_CURRENT_USER, 
+                                 "Software\\Microsoft\\Internet Explorer\\New Windows\\Allow", 0, wreg.KEY_ALL_ACCESS)
+
+        wreg.SetValueEx(allow_reg, urlparse(windmill.settings['TEST_URL']).hostname,
+                        0, wreg.REG_BINARY, None)
 
         self.p_handle = killableprocess.Popen(self.cmd)
 
     def stop(self):
 
-        for key, value in self.registry_modifications:
+        for key, value in self.registry_modifications.items():
             if value['previous_value'] is not None:
                 wreg.SetValueEx(self.reg, key, 0, value['type'], value['previous_value'])
             else:
-                wreg.DeleteKey(self.reg, key)
+                wreg.DeleteValue(self.reg, key)
 
         try:
             self.p_handle.kill(group=True)

diff --git a/windmill/conf/global_settings.py b/windmill/conf/global_settings.py
@@ -68,4 +68,4 @@
 elif sys.platform == 'win32':
     MOZILLA_BINARY = "C:\\Program Files\\Mozilla Firefox\\firefox.exe"
     MOZILLA_DEFAULT_PROFILE = "C:\Program Files\Mozilla Firefox\defaults\profile"
-    IE_BINARY = "C:\\Program Files\\Internet Explorer\\iexpore.exe"
+    IE_BINARY = "C:\\Program Files\\Internet Explorer\\iexplore.exe"