use binary mode to write test pickles

djmitche · Jun 7, 2010 · 7c37381 · 7c37381
1 parent e2b10b8
commit 7c37381
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/master/buildbot/test/regressions/test_import_unicode_changes.py b/master/buildbot/test/regressions/test_import_unicode_changes.py
@@ -39,7 +39,7 @@ def testUnicodeChange(self):
             files=["foo"], comments=u"Frosty the \N{SNOWMAN}".encode("utf8"),
             branch="b1", revision=12345)]
         cPickle.dump(self.mkchanges(changes), open(os.path.join(self.basedir,
-            "changes.pck"), "w"))
+            "changes.pck"), "wb"))
 
         sm = manager.DBSchemaManager(self.spec, self.basedir)
         sm.upgrade(quiet=True)
@@ -54,21 +54,17 @@ def testNonUnicodeChange(self):
         changes = [Change(who="\xff\xff\x00", files=["foo"],
             comments="\xff\xff\x00", branch="b1", revision=12345)]
         cPickle.dump(self.mkchanges(changes), open(os.path.join(self.basedir,
-            "changes.pck"), "w"))
+            "changes.pck"), "wb"))
 
         sm = manager.DBSchemaManager(self.spec, self.basedir)
-        try:
-            self.assertRaises(UnicodeError, lambda : sm.upgrade(quiet=True))
-        except ImportError:
-            print sys.modules
-            raise
+        self.assertRaises(UnicodeError, lambda : sm.upgrade(quiet=True))
 
     def testAsciiChange(self):
         # Create changes.pck
         changes = [Change(who="Frosty the Snowman",
             files=["foo"], comments="Frosty the Snowman", branch="b1", revision=12345)]
         cPickle.dump(self.mkchanges(changes), open(os.path.join(self.basedir,
-            "changes.pck"), "w"))
+            "changes.pck"), "wb"))
 
         sm = manager.DBSchemaManager(self.spec, self.basedir)
         sm.upgrade(quiet=True)
@@ -91,7 +87,7 @@ def testUTF16Change(self):
         cm.recode_changes('utf16', quiet=True)
 
         # and dump the recoded changemanager to changes.pck before trying a schema upgrade
-        cPickle.dump(cm, open(os.path.join(self.basedir, "changes.pck"), "w"))
+        cPickle.dump(cm, open(os.path.join(self.basedir, "changes.pck"), "wb"))
 
         sm = manager.DBSchemaManager(self.spec, self.basedir)
         sm.upgrade(quiet=True)

diff --git a/master/buildbot/test/unit/test_db_schema_master.py b/master/buildbot/test/unit/test_db_schema_master.py
@@ -88,7 +88,7 @@ def fill_basedir_changes(self):
 
         # embed it in a Changes object and pickle it up
         changesource = Thing(changes=changes)
-        f = open(os.path.join(self.basedir, "changes.pck"), "w")
+        f = open(os.path.join(self.basedir, "changes.pck"), "wb")
         f.write(cPickle.dumps(changesource))
 
     def assertDatabaseOKFull(self):