r19696 - in /branches/relax_disp: ./ test_suite/unit_tests/package_checking.py -- May 17, 2013 - 10:47

Author: bugman
Date: Fri May 17 10:47:59 2013
New Revision: 19696

URL: http://svn.gna.org/viewcvs/relax?rev=19696&view=rev
Log:
Merged revisions 19695 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r19695 | bugman | 2013-05-17 10:47:20 +0200 (Fri, 17 May 2013) | 12 lines
  
  Fix for the package checking as part of the unit tests.
  
  This was identified from the bug report #20820 
(https://gna.org/bugs/?20820) submitted by Troels E.
  Linnet (https://gna.org/users/tlinnet).
  
  The problem was that on some systems, the full path is required for 
checking the presence of the
  directories which are the sub-packages of the main package being checked.  
The result was that 
  checking for the package in the __all__ list was skipped.
  
  Note that this change does not fix the bug reported.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/test_suite/unit_tests/package_checking.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri May 17 10:47:59 2013
@@ -1,1 +1,1 @@
-/trunk:1-19691
+/trunk:1-19695

Modified: branches/relax_disp/test_suite/unit_tests/package_checking.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/unit_tests/package_checking.py?rev=19696&r1=19695&r2=19696&view=diff
==============================================================================
--- branches/relax_disp/test_suite/unit_tests/package_checking.py (original)
+++ branches/relax_disp/test_suite/unit_tests/package_checking.py Fri May 17 
10:47:59 2013
@@ -25,6 +25,7 @@
 from re import search
 
 # relax module imports.
+from status import Status; status = Status()
 from test_suite.unit_tests.base_classes import UnitTestCase
 
 
@@ -42,6 +43,9 @@
         files = listdir(self.package_path)
         skip = ['__init__.py']
         for file in files:
+            # The full path.
+            path = status.install_path + sep + self.package_name + sep + file
+
             # Files and directories to skip.
             if file in skip:
                 continue
@@ -51,7 +55,7 @@
                 continue
 
             # Only check Python files and directories.
-            if not search("\.py$", file) and not isdir(file):
+            if not search("\.py$", file) and not isdir(path):
                 continue
 
             # Skip blacklisted files.