commit d7c9309cbed2d86123db8f4ec29aa2ca1a841993
author Mike Frysinger <vapier@chromium.org> Mon Oct 14 00:12:50 2019 -0400
committer Mike Frysinger <vapier@chromium.org> Tue Oct 22 23:14:30 2019 +0000
tree c6a45d7cf945ba0afcfa865482fbf2e5b203b5ed
parent 1834bbb39c1c5c398e4c4b9b65e3a7bdc764c8de

pushimage: fix up for python 3

Make sure the dict ordering is consistent, and use context managers
with open to avoid warnings about unclosed file handles.

BUG=chromium:997354
TEST=`./run_tests` passes

Change-Id: Ia3b8ed333afd326ba7f85140a572415063e42643
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1872656
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

scripts/pushimage_unittest.py

diff --git a/scripts/pushimage_unittest.py b/scripts/pushimage_unittest.py
index c620e6f..a801570 100644
--- a/scripts/pushimage_unittest.py
+++ b/scripts/pushimage_unittest.py
@@ -7,6 +7,7 @@
 
 from __future__ import print_function
 
+import collections
 import os
 
 import mock
@@ -102,10 +103,10 @@
         'channel': 'dev',
         'keyset': 'batman',
     }
-    sect_general = {
-        'config_board': 'test.board',
-        'board': 'board',
-    }
+    sect_general = collections.OrderedDict((
+        ('board', 'board'),
+        ('config_board', 'test.board'),
+    ))
 
     insns = pushimage.InputInsns('test.board')
     m = self.PatchObject(osutils, 'WriteFile')
@@ -147,10 +148,10 @@
         'override': 'sect_insns',
     }
     sect_insns_copy = sect_insns.copy()
-    sect_general = {
-        'config_board': 'test.board',
-        'board': 'board',
-    }
+    sect_general = collections.OrderedDict((
+        ('board', 'board'),
+        ('config_board', 'test.board'),
+    ))
 
     insns = pushimage.InputInsns('test.multi')
     self.assertEqual(insns.GetAltInsnSets(), exp_alts)