Author: bugman
Date: Mon Jan 13 10:08:11 2014
New Revision: 21956
URL: http://svn.gna.org/viewcvs/relax?rev=21956&view=rev
Log:
Merged revisions 21954 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r21954 | bugman | 2014-01-13 09:59:48 +0100 (Mon, 13 Jan 2014) | 8 lines
Created the Relax_disp.test_bug_21460_disp_cluster_fail system test.
This is to catch bug #21460 (https://gna.org/bugs/?21460) reported by
Min-Kyu Cho (min-kyu dott cho
att live dot com).
The save file added to the repository consists solely of the data for the
first residue.
........
Added:
branches/double_rotor/test_suite/shared_data/saved_states/bug_21460_bad_fields.bz2
- copied unchanged from r21954,
trunk/test_suite/shared_data/saved_states/bug_21460_bad_fields.bz2
Modified:
branches/double_rotor/ (props changed)
branches/double_rotor/test_suite/system_tests/relax_disp.py
Propchange: branches/double_rotor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 13 10:08:11 2014
@@ -1,1 +1,1 @@
-/trunk:1-21949
+/trunk:1-21949,21954
Modified: branches/double_rotor/test_suite/system_tests/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/system_tests/relax_disp.py?rev=21956&r1=21955&r2=21956&view=diff
==============================================================================
--- branches/double_rotor/test_suite/system_tests/relax_disp.py (original)
+++ branches/double_rotor/test_suite/system_tests/relax_disp.py Mon Jan 13
10:08:11 2014
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2006-2013 Edward d'Auvergne
#
+# Copyright (C) 2006-2014 Edward d'Auvergne
#
# Copyright (C) 2009 Sebastien Morin
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
@@ -247,6 +247,21 @@
# Model selection - to catch the failure.
self.interpreter.model_selection(method='AIC', modsel_pipe='final',
bundle='relax_disp', pipes=['No Rex', 'CR72'])
+
+
+ def test_bug_21460_disp_cluster_fail(self):
+ """U{Bug #21460<https://gna.org/bugs/?21460>} catch, the failure due
to a spectrometer frequency having no relaxation data."""
+
+ # Clear the data store.
+ self.interpreter.reset()
+
+ # Load the state.
+ state = status.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'saved_states'+sep+'bug_21460_bad_fields.bz2'
+ self.interpreter.state.load(state, force=True)
+
+ # Execute the auto-analysis.
+ relax_disp.Relax_disp(pipe_name="origin - relax_disp (Thu Jan 2
13:46:44 2014)", pipe_bundle="relax_disp (Thu Jan 2 13:46:44 2014)",
results_dir=self.tmpdir, models=['R2eff', 'No Rex', 'CR72', 'NS CPMG 2-site
expanded'], grid_inc=3, mc_sim_num=5, modsel='AIC', pre_run_dir=None,
insignificance=1.0, numeric_only=False, mc_sim_all_models=False,
eliminate=True)
+
def test_curve_type_cpmg_fixed_time(self):
r21956 - in /branches/double_rotor: ./ test_suite/shared_data/saved_states/ test_suite/system_tests/