r15475 - in /branches/frame_order_testing: ./ test_suite/unit_tests/ test_suite/unit_tests/_multi/ -- March 13, 2012 - 17:05

Author: bugman
Date: Tue Mar 13 17:05:25 2012
New Revision: 15475

URL: http://svn.gna.org/viewcvs/relax?rev=15475&view=rev
Log:
Merged revisions 15473-15474 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r15473 | bugman | 2012-03-13 16:56:38 +0100 (Tue, 13 Mar 2012) | 3 lines
  
  Added the ability to skip scripts in the package __all__ list unit test 
checks.
........
  r15474 | bugman | 2012-03-13 16:57:14 +0100 (Tue, 13 Mar 2012) | 3 lines
  
  The multi-processor package 'test_implementation.py' script is now 
blacklisted from the __all__ check.
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/test_suite/unit_tests/_multi/test___init__.py
    branches/frame_order_testing/test_suite/unit_tests/package_checking.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Mar 13 17:05:25 2012
@@ -1,1 +1,1 @@
-/1.3:1-15471
+/1.3:1-15474

Modified: 
branches/frame_order_testing/test_suite/unit_tests/_multi/test___init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/_multi/test___init__.py?rev=15475&r1=15474&r2=15475&view=diff
==============================================================================
--- 
branches/frame_order_testing/test_suite/unit_tests/_multi/test___init__.py 
(original)
+++ 
branches/frame_order_testing/test_suite/unit_tests/_multi/test___init__.py 
Tue Mar 13 17:05:25 2012
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2009 Edward d'Auvergne                                       
 #
+# Copyright (C) 2009-2012 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #
@@ -38,3 +38,6 @@
         self.package = multi
         self.package_name = 'multi'
         self.package_path = sys.path[0] + sep + 'multi'
+
+        # Blacklisted scripts.
+        self.blacklist = ['test_implementation.py']

Modified: 
branches/frame_order_testing/test_suite/unit_tests/package_checking.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/package_checking.py?rev=15475&r1=15474&r2=15475&view=diff
==============================================================================
--- branches/frame_order_testing/test_suite/unit_tests/package_checking.py 
(original)
+++ branches/frame_order_testing/test_suite/unit_tests/package_checking.py 
Tue Mar 13 17:05:25 2012
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2009-2011 Edward d'Auvergne                                  
 #
+# Copyright (C) 2009-2012 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #
@@ -47,6 +47,10 @@
             if file == '__init__.py':
                 continue
 
+            # Skip blacklisted files.
+            if hasattr(self, 'blacklist') and file in self.blacklist:
+                continue
+
             # Remove the '.py' part.
             module = file[:-3]