r28011 - /trunk/test_suite/gui_tests/base_classes.py -- October 07, 2015 - 08:29

Author: bugman
Date: Wed Oct  7 08:29:05 2015
New Revision: 28011

URL: http://svn.gna.org/viewcvs/relax?rev=28011&view=rev
Log:
Partly reverted r28010 - some Mac OS X testing changes were accidentally 
committed.

The command used was:
svn merge -r28010:28009 test_suite/gui_tests/base_classes.py


Modified:
    trunk/test_suite/gui_tests/base_classes.py

Modified: trunk/test_suite/gui_tests/base_classes.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/gui_tests/base_classes.py?rev=28011&r1=28010&r2=28011&view=diff
==============================================================================
--- trunk/test_suite/gui_tests/base_classes.py  (original)
+++ trunk/test_suite/gui_tests/base_classes.py  Wed Oct  7 08:29:05 2015
@@ -36,7 +36,7 @@
 from gui.string_conv import str_to_gui
 from gui.uf_objects import Uf_storage; uf_store = Uf_storage()
 from gui.wizards.wiz_objects import Wiz_window
-from lib.compat import SYSTEM, queue
+from lib.compat import queue
 from lib.errors import RelaxError
 from pipe_control.reset import reset
 from prompt.interpreter import exec_script
@@ -309,23 +309,22 @@
         self.clean_up_windows()
 
         # Print out a list of all living windows to help ensure that custom 
Close() and Destroy() methods are cleaning up all objects.
-        if SYSTEM != 'Darwin':
-            print("\n\nList of all living GUI elements - this must only 
include the main GUI window and the relax controller:")
-            all_destroyed = True
-            for window in wx.GetTopLevelWindows():
-                # Printout.
-                print("    Window: %s" % window)
-                if isinstance(window, Wiz_window):
-                    print("        Wizard title: %s" % window.title)
-                    print("        Wizard pages: %s" % window._pages)
-
-                # Skip the main GUI window and the relax controller.
-                if isinstance(window, Main) or isinstance(window, 
Controller):
-                    continue
-
-                # Failure of memory management.
-                all_destroyed = False
-            print("\n\n\n")
+        print("\n\nList of all living GUI elements - this must only include 
the main GUI window and the relax controller:")
+        all_destroyed = True
+        for window in wx.GetTopLevelWindows():
+            # Printout.
+            print("    Window: %s" % window)
+            if isinstance(window, Wiz_window):
+                print("        Wizard title: %s" % window.title)
+                print("        Wizard pages: %s" % window._pages)
+
+            # Skip the main GUI window and the relax controller.
+            if isinstance(window, Main) or isinstance(window, Controller):
+                continue
+
+            # Failure of memory management.
+            all_destroyed = False
+        print("\n\n\n")
 
         # Memory management check.
         #if not all_destroyed: