further fix/tests for record edits clobbering DictDB

minrk · minrk · commit 0e1a17ef9bcb · 2012-06-01T18:18:09.000-07:00
diff --git a/IPython/parallel/controller/dictdb.py b/IPython/parallel/controller/dictdb.py
@@ -46,7 +46,7 @@
 #  the file COPYING, distributed as part of this software.
 #-----------------------------------------------------------------------------
 
-from copy import copy
+from copy import deepcopy as copy
 from datetime import datetime
 
 from IPython.config.configurable import LoggingConfigurable
@@ -129,7 +129,7 @@ def _extract_subdict(self, rec, keys):
         d['msg_id'] = rec['msg_id']
         for key in keys:
             d[key] = rec[key]
-        return d
+        return copy(d)
 
     def add_record(self, msg_id, rec):
         """Add a new Task Record, by msg_id."""
diff --git a/IPython/parallel/tests/test_db.py b/IPython/parallel/tests/test_db.py
@@ -197,29 +197,35 @@ def test_pop_safe_get(self):
         rec = self.db.get_record(msg_id)
         rec.pop('buffers')
         rec['garbage'] = 'hello'
+        rec['header']['msg_id'] = 'fubar'
         rec2 = self.db.get_record(msg_id)
         self.assertTrue('buffers' in rec2)
         self.assertFalse('garbage' in rec2)
+        self.assertEquals(rec2['header']['msg_id'], msg_id)
     
     def test_pop_safe_find(self):
         """editing query results shouldn't affect record [find]"""
         msg_id = self.db.get_history()[-1]
         rec = self.db.find_records({'msg_id' : msg_id})[0]
         rec.pop('buffers')
         rec['garbage'] = 'hello'
+        rec['header']['msg_id'] = 'fubar'
         rec2 = self.db.find_records({'msg_id' : msg_id})[0]
         self.assertTrue('buffers' in rec2)
         self.assertFalse('garbage' in rec2)
+        self.assertEquals(rec2['header']['msg_id'], msg_id)
 
     def test_pop_safe_find_keys(self):
         """editing query results shouldn't affect record [find+keys]"""
         msg_id = self.db.get_history()[-1]
-        rec = self.db.find_records({'msg_id' : msg_id}, keys=['buffers'])[0]
+        rec = self.db.find_records({'msg_id' : msg_id}, keys=['buffers', 'header'])[0]
         rec.pop('buffers')
         rec['garbage'] = 'hello'
+        rec['header']['msg_id'] = 'fubar'
         rec2 = self.db.find_records({'msg_id' : msg_id})[0]
         self.assertTrue('buffers' in rec2)
         self.assertFalse('garbage' in rec2)
+        self.assertEquals(rec2['header']['msg_id'], msg_id)
 
 
 class TestSQLiteBackend(TestDictBackend):
