r17799 - /trunk/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py -- October 15, 2012 - 10:21

Author: bugman
Date: Mon Oct 15 10:21:37 2012
New Revision: 17799

URL: http://svn.gna.org/viewcvs/relax?rev=17799&view=rev
Log:
Python 3 fix for the ScientificPython PDB reader unit tests.

The order of the keys returned by a dictionary's keys() method changes 
randomly in Python 3, so now
they are sorted prior to comparison.


Modified:
    trunk/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py

Modified: 
trunk/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py?rev=17799&r1=17798&r2=17799&view=diff
==============================================================================
--- trunk/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py 
(original)
+++ trunk/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py 
Mon Oct 15 10:21:37 2012
@@ -90,7 +90,9 @@
         self.assertEqual(res_num, 12)
         self.assertEqual(res_name, 'GLY')
         self.assertEqual(len(res.atoms), 7)
-        self.assertEqual(list(res.atoms.keys()), ['C', 'H', 'CA', 'O', 'N', 
'1HA', '2HA'])
+        atom_keys = list(res.atoms.keys())
+        atom_keys.sort()
+        self.assertEqual(atom_keys, ['1HA', '2HA', 'C', 'CA', 'H', 'N', 
'O'])   # Sorted key comparison needed as key order is not preserved in 
Python 3.
 
 
     def test___residue_loop_selection(self):
@@ -114,7 +116,9 @@
         self.assertEqual(res_num, 12)
         self.assertEqual(res_name, 'GLY')
         self.assertEqual(len(res.atoms), 7)
-        self.assertEqual(list(res.atoms.keys()), ['C', 'H', 'CA', 'O', 'N', 
'1HA', '2HA'])
+        atom_keys = list(res.atoms.keys())
+        atom_keys.sort()
+        self.assertEqual(atom_keys, ['1HA', '2HA', 'C', 'CA', 'H', 'N', 
'O'])   # Sorted key comparison needed as key order is not preserved in 
Python 3.
 
 
     def test___residue_loop_selection_no_match(self):