Merge lp:~mterry/auto-upgrade-testing/str-buffer into lp:~auto-upgrade-testing-dev/auto-upgrade-testing/trunk

[Michael Terry]

[Colin Watson (cjwatson)]

On Fri, Jul 06, 2012 at 05:36:26PM -0000, Michael Terry wrote:
> interfaces = tempfile.NamedTemporaryFile()
> - interfaces.write("""
> + interfaces.write(bytes("""

You can use b"""...""" rather than bytes(). But this is really text
data, so I recommend instead simply opening the file in text mode:

  interfaces = tempfile.NamedTemporaryFile(mode="w+")

... and similarly for the other occurrences. (You can add
encoding="UTF-8" if you need it, but it looks like you shouldn't.)

[lp:~mterry/auto-upgrade-testing/str-buffer]

32. By Michael Terry on 2012-07-09

fix mode of tempfiles to accept strings

[Michael Terry (mterry)]

Updated to use the mode="w+" method, which is certainly cleaner. Thanks, Colin!

This branch is ready to be re-reviewed.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'AutoUpgradeTester/UpgradeTestBackendQemu.py'
--- AutoUpgradeTester/UpgradeTestBackendQemu.py	2012-06-15 09:53:41 +0000
+++ AutoUpgradeTester/UpgradeTestBackendQemu.py	2012-07-09 21:04:24 +0000
@@ -247,7 +247,7 @@
         # going into the VM with ssh)
         nm = self.config.getWithDefault("NonInteractive","WorkaroundNetworkManager","")
         if nm:
-            interfaces = tempfile.NamedTemporaryFile()
+            interfaces = tempfile.NamedTemporaryFile(mode="w+")
             interfaces.write("""
 auto lo
 iface lo inet loopback
@@ -264,7 +264,7 @@
         # generate hosts file, the default hosts file contains
         # "127.0.0.1 ubuntu. ubuntu" for some reason and the missing
         # domain part after the "." makes e.g. postfix rather unhappy
-        etc_hosts = tempfile.NamedTemporaryFile()
+        etc_hosts = tempfile.NamedTemporaryFile(mode="w+")
         etc_hosts.write('127.0.0.1 localhost\n')
         etc_hosts.write('127.0.0.1 upgrade-test-vm\n')
         etc_hosts.flush()
@@ -273,13 +273,13 @@
         # generate apt.conf
         proxy = self.config.getWithDefault("NonInteractive","Proxy","")
         if proxy:
-            aptconf = tempfile.NamedTemporaryFile()
+            aptconf = tempfile.NamedTemporaryFile(mode="w+")
             aptconf.write('Acquire::http::proxy "%s";' % proxy)
             aptconf.flush()
             self._copyToImage(aptconf.name, "/etc/apt/apt.conf")
 
         # tzdata is unhappy without that file
-        tzone = tempfile.NamedTemporaryFile()
+        tzone = tempfile.NamedTemporaryFile(mode="w+")
         tzone.write("Europe/Berlin")
         tzone.flush()
         self._copyToImage(tzone.name, "/etc/timezone")