Author: bugman
Date: Fri Feb 20 09:32:40 2015
New Revision: 27686
URL: http://svn.gna.org/viewcvs/relax?rev=27686&view=rev
Log:
Merged revisions 27683-27684 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r27683 | bugman | 2015-02-20 09:31:15 +0100 (Fri, 20 Feb 2015) | 3 lines
Added the PDB file to the repository for the
Structure.test_bug_23294_multi_mol_automerge system test.
........
r27684 | bugman | 2015-02-20 09:32:09 +0100 (Fri, 20 Feb 2015) | 6 lines
Fix for the Structure.test_bug_23294_multi_mol_automerge system test.
The MASTER PDB record has been added to the data to check for, as this will
be produced by the
structure.write_pdb user function.
........
Added:
branches/frame_order_cleanup/test_suite/shared_data/structures/bug_23294_multi_mol_automerge.pdb
- copied unchanged from r27684,
trunk/test_suite/shared_data/structures/bug_23294_multi_mol_automerge.pdb
Modified:
branches/frame_order_cleanup/ (props changed)
branches/frame_order_cleanup/test_suite/system_tests/structure.py
Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Feb 20 09:32:40 2015
@@ -1 +1 @@
-/trunk:1-27680
+/trunk:1-27684
Modified: branches/frame_order_cleanup/test_suite/system_tests/structure.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/structure.py?rev=27686&r1=27685&r2=27686&view=diff
==============================================================================
--- branches/frame_order_cleanup/test_suite/system_tests/structure.py
(original)
+++ branches/frame_order_cleanup/test_suite/system_tests/structure.py Fri
Feb 20 09:32:40 2015
@@ -916,6 +916,7 @@
"ATOM 4 H GLU A 2 4.000 0.000 0.000 1.00
0.00 H \n",
"TER 5 GLU A 2
\n",
"ENDMDL
\n",
+ "MASTER 0 0 0 0 0 0 0 0 4 1
0 0 \n",
"END
\n"
]
r27686 - in /branches/frame_order_cleanup: ./ test_suite/shared_data/structures/ test_suite/system_tests/