Merge lp:~cjwatson/storm/pickle-variable-tests-dict-order into lp:storm

[Colin Watson]

Don't depend on dict ordering in pickle variable tests.

We care that pickled output is written back to the underlying variable, but not what order the dict is in.

[Guillermo Gonzalez (verterok)]

LGTM

review: Approve

=== modified file 'tests/store/base.py'
--- tests/store/base.py	2019-05-29 15:35:00 +0000
+++ tests/store/base.py	2019-05-29 16:08:48 +0000
@@ -20,6 +20,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+import cPickle as pickle
 from cStringIO import StringIO
 import decimal
 import gc
@@ -4709,7 +4710,7 @@
 
         self.store.flush()
         self.store.reload(blob)
-        self.assertEquals(blob.bin, "\x80\x02}q\x01(U\x01aK\x01U\x01bK\x02u.")
+        self.assertEquals(pickle.loads(blob.bin), {"a": 1, "b": 2})
 
     def test_pickle_variable_remove(self):
         """
@@ -4931,7 +4932,7 @@
 
         self.store.flush()
         self.store.reload(blob)
-        self.assertEquals(blob.bin, "\x80\x02}q\x01(U\x01aK\x01U\x01bK\x02u.")
+        self.assertEquals(pickle.loads(blob.bin), {"a": 1, "b": 2})
 
     def test_unhashable_object(self):