[commit] r2558 - trunk/Tests/GPyUnit

[GMESRC Repository Notifications]

Author: ksmyth
Date: Wed Oct 29 10:43:44 2014
New Revision: 2558

Log:
test_gmeoleapp: restore script engine

Modified:
   trunk/Tests/GPyUnit/test_gmeoleapp.py

Modified: trunk/Tests/GPyUnit/test_gmeoleapp.py
==============================================================================
--- trunk/Tests/GPyUnit/test_gmeoleapp.py	Wed Oct 29 10:43:40 2014	(r2557)
+++ trunk/Tests/GPyUnit/test_gmeoleapp.py	Wed Oct 29 10:43:44 2014	(r2558)
@@ -20,32 +20,36 @@
         import win32com.client
 
         registrar = DispatchEx("Mga.MgaRegistrar")
+        old_engine = registrar.GetScriptEngineDisp(1)
         registrar.SetScriptEngineDisp(1, "JScript")
         
-        def _adjacent_file(file):
-            import os.path
-            return os.path.join(os.path.dirname(os.path.abspath(__file__)), file)
-        self.gme = DispatchEx("GME.Application")
-        self.gme.Version
-        console = filter(lambda p: p.Name == "Console", self.gme.Panels)[0]
-        intf = console.Interface
-        # 'intf.Contents =' fails because python calls Invoke(wFlags=3) instead of DISPATCH_PROPERTYPUT=4
-        intf.SetContents('magicstring')
-        self.assertEqual(intf.Contents, 'magicstring')
-        
-        jscode = 'gme.ConsoleMessage("magic2string", 0);\n'
-        with open(_adjacent_file('_console_utf16.js'), 'wb') as file:
-           file.write('\xFF\xFE')
-           file.write(unicode(jscode).encode('utf-16le'))
-        intf.LoadScript(_adjacent_file('_console_utf16.js'))
-        intf.RunLoadedScript()
-        self.assertTrue(intf.Contents.find('magic2string') != -1, 'Console contents: "' + intf.Contents + '"')
-        
-        with open(_adjacent_file('_console_ansi.js'), 'wb') as file:
-            file.write(jscode.replace('magic2string', 'magic3string'))
-        intf.LoadScript(_adjacent_file('_console_ansi.js'))
-        intf.RunLoadedScript()
-        self.assertTrue(intf.Contents.find('magic3string') != -1, 'Console contents: "' + intf.Contents + '"')
+        try:
+            def _adjacent_file(file):
+                import os.path
+                return os.path.join(os.path.dirname(os.path.abspath(__file__)), file)
+            self.gme = DispatchEx("GME.Application")
+            self.gme.Version
+            console = filter(lambda p: p.Name == "Console", self.gme.Panels)[0]
+            intf = console.Interface
+            # 'intf.Contents =' fails because python calls Invoke(wFlags=3) instead of DISPATCH_PROPERTYPUT=4
+            intf.SetContents('magicstring')
+            self.assertEqual(intf.Contents, 'magicstring')
+            
+            jscode = 'gme.ConsoleMessage("magic2string", 0);\n'
+            with open(_adjacent_file('_console_utf16.js'), 'wb') as file:
+               file.write('\xFF\xFE')
+               file.write(unicode(jscode).encode('utf-16le'))
+            intf.LoadScript(_adjacent_file('_console_utf16.js'))
+            intf.RunLoadedScript()
+            self.assertTrue(intf.Contents.find('magic2string') != -1, 'Console contents: "' + intf.Contents + '"')
+            
+            with open(_adjacent_file('_console_ansi.js'), 'wb') as file:
+                file.write(jscode.replace('magic2string', 'magic3string'))
+            intf.LoadScript(_adjacent_file('_console_ansi.js'))
+            intf.RunLoadedScript()
+            self.assertTrue(intf.Contents.find('magic3string') != -1, 'Console contents: "' + intf.Contents + '"')
+        finally:
+            registrar.SetScriptEngineDisp(1, old_engine)
         
     def setUp(self):
         self.gme = None