r19285 - in /trunk/test_suite: shared_data/consistency_testing/ system_tests/ system_tests/scripts/ -- April 02, 2013 - 11:05

Author: bugman
Date: Tue Apr  2 11:05:27 2013
New Revision: 19285

URL: http://svn.gna.org/viewcvs/relax?rev=19285&view=rev
Log:
Manually merged r19282 from the 2.2 development line to trunk.

The command used was:
svn merge -r19281:19282 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/2.2 .

.....
  r19282 | bugman | 2013-04-02 10:47:26 +0200 (Tue, 02 Apr 2013) | 6 lines
  Changed paths:
     A /branches/2.2/test_suite/shared_data/consistency_testing
     A 
/branches/2.2/test_suite/shared_data/consistency_testing/bug_20674_ct_analysis_failure
     A 
/branches/2.2/test_suite/shared_data/consistency_testing/bug_20674_ct_analysis_failure/2QFK_MONOMERHabc5.pdb
     A 
/branches/2.2/test_suite/shared_data/consistency_testing/bug_20674_ct_analysis_failure/NOE
 dhp 700.txt
     A 
/branches/2.2/test_suite/shared_data/consistency_testing/bug_20674_ct_analysis_failure/T1
 dhp 700.txt
     A 
/branches/2.2/test_suite/shared_data/consistency_testing/bug_20674_ct_analysis_failure/T2
 dhp 700.txt
     M /branches/2.2/test_suite/system_tests/consistency_tests.py
     A 
/branches/2.2/test_suite/system_tests/scripts/bug_20674_ct_analysis_failure.py
  
  Created the Ct.test_bug_20674_ct_analysis_failure system test for catching 
bug #20674.
  
  This was reported by Mengjun Xue <mengjun dott xue att mailbox dott 
tu-berlin dot de> at
  https://gna.org/bugs/?20674.
.....


Added:
    trunk/test_suite/shared_data/consistency_testing/
      - copied from r19282, 
branches/2.2/test_suite/shared_data/consistency_testing/
    trunk/test_suite/system_tests/scripts/bug_20674_ct_analysis_failure.py
      - copied unchanged from r19282, 
branches/2.2/test_suite/system_tests/scripts/bug_20674_ct_analysis_failure.py
Modified:
    trunk/test_suite/system_tests/consistency_tests.py

Modified: trunk/test_suite/system_tests/consistency_tests.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/consistency_tests.py?rev=19285&r1=19284&r2=19285&view=diff
==============================================================================
--- trunk/test_suite/system_tests/consistency_tests.py (original)
+++ trunk/test_suite/system_tests/consistency_tests.py Tue Apr  2 11:05:27 
2013
@@ -44,6 +44,13 @@
         self.interpreter.pipe.create('ct', 'ct')
 
 
+    def test_bug_20674_ct_analysis_failure(self):
+        """Test catching U{bug #20674<https://gna.org/bugs/?20674>}, the ct 
analysis failure submitted by Mengjun Xue."""
+
+        # Execute the script.
+        self.script_exec(status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'bug_20674_ct_analysis_failure.py')
+
+
     def test_calc(self):
         """The consistency testing calculation test."""