Author: bugman Date: Mon Nov 10 18:56:00 2014 New Revision: 26496 URL: http://svn.gna.org/viewcvs/relax?rev=26496&view=rev Log: Merged revisions 26495 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r26495 | bugman | 2014-11-10 18:55:29 +0100 (Mon, 10 Nov 2014) | 7 lines Fix for bug #22938 (https://gna.org/bugs/?22938). This is the failure of the test suite in the relax GUI. The problem was that the status.skip_blacklisted_tests variable did not exist - it was only initialised if relax is started in test suite mode. Now the value is always set from within the status module and defaults to True. ........ Modified: branches/frame_order_cleanup/ (props changed) branches/frame_order_cleanup/status.py Propchange: branches/frame_order_cleanup/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Mon Nov 10 18:56:00 2014 @@ -1 +1 @@ -/trunk:1-26492 +/trunk:1-26495 Modified: branches/frame_order_cleanup/status.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/status.py?rev=26496&r1=26495&r2=26496&view=diff ============================================================================== --- branches/frame_order_cleanup/status.py (original) +++ branches/frame_order_cleanup/status.py Mon Nov 10 18:56:00 2014 @@ -59,6 +59,7 @@ self._instance.show_gui = False self._instance.gui_uf_force_sync = False self._instance.install_path = self._instance._det_install_path() + self._instance.skip_blacklisted_tests = True # Set up the singleton. self._instance._setup()