Author: bugman
Date: Fri Sep 25 14:14:17 2015
New Revision: 27874
URL: http://svn.gna.org/viewcvs/relax?rev=27874&view=rev
Log:
Merged revisions 27849-27850 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r27849 | tlinnet | 2015-06-13 14:00:39 +0200 (Sat, 13 Jun 2015) | 5 lines
Added unittest that shows the trickers the bug.
Test added in test_delete_spin_all, and can be accessed with: relax -u
_pipe_control.test_spin.
Bug #23642 (https://gna.org/bugs/index.php?23642): When deleting all spins
for a residue, an empty placeholder is where select=True
........
r27850 | tlinnet | 2015-06-13 14:08:44 +0200 (Sat, 13 Jun 2015) | 3 lines
Fix committed, where an empty spin placeholder has the select flag set to
False.
Bug #23642 (https://gna.org/bugs/index.php?23642): When deleting all spins
for a residue, an empty placeholder is where select=True
........
Modified:
branches/frame_order_cleanup/ (props changed)
branches/frame_order_cleanup/pipe_control/mol_res_spin.py
branches/frame_order_cleanup/test_suite/unit_tests/spin_testing_base.py
Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Sep 25 14:14:17 2015
@@ -1 +1 @@
-/trunk:1-27797,27800-27848
+/trunk:1-27797,27800-27850
Modified: branches/frame_order_cleanup/pipe_control/mol_res_spin.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/pipe_control/mol_res_spin.py?rev=27874&r1=27873&r2=27874&view=diff
==============================================================================
--- branches/frame_order_cleanup/pipe_control/mol_res_spin.py (original)
+++ branches/frame_order_cleanup/pipe_control/mol_res_spin.py Fri Sep 25
14:14:17 2015
@@ -1072,7 +1072,7 @@
# Create an empty spin container if no spins remain.
if len(res.spin) == 0:
- res.spin.add_item()
+ res.spin.add_item(select=False)
# Update all metadata.
metadata_update()
Modified:
branches/frame_order_cleanup/test_suite/unit_tests/spin_testing_base.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/unit_tests/spin_testing_base.py?rev=27874&r1=27873&r2=27874&view=diff
==============================================================================
--- branches/frame_order_cleanup/test_suite/unit_tests/spin_testing_base.py
(original)
+++ branches/frame_order_cleanup/test_suite/unit_tests/spin_testing_base.py
Fri Sep 25 14:14:17 2015
@@ -475,6 +475,7 @@
# Test that the first spin defaults back to the empty spin.
self.assertEqual(dp.mol[0].res[0].spin[0].num, None)
self.assertEqual(dp.mol[0].res[0].spin[0].name, None)
+ self.assertEqual(dp.mol[0].res[0].spin[0].select, False)
def test_delete_spin_shift(self):
r27874 - in /branches/frame_order_cleanup: ./ pipe_control/mol_res_spin.py test_suite/unit_tests/spin_testing_base.py