commit c0e1876d5f691a3338fef60124e9c14da8f9ddb1
author Zdenek Behan <zbehan@chromium.org> Sat Sep 22 04:06:17 2012 +0200
committer Gerrit <chrome-bot@google.com> Fri Oct 05 15:21:15 2012 -0700
tree e8897fc9f9a08bf65e24a06becaf0f8ad136534f
parent 7b070ee38b0b46c9563f068d15237b2615a7c385

chromite: cleanup unit tests

Cleans up:
* some leftover tmpdir usage
* some unused things
* osutils references to Touch and WriteFile
* Fixed cros_portage_upgrade_unittest that suffered bitrot

BUG=none
TEST=run them
TEST=pylint *_unittest.py

Change-Id: I62572ccf7f0fb8101fb09bcfc3d87a2a54d008e6
Reviewed-on: https://gerrit.chromium.org/gerrit/33844
Tested-by: Zdenek Behan <zbehan@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Commit-Ready: Zdenek Behan <zbehan@chromium.org>

scripts/upload_prebuilts_unittest.py

diff --git a/scripts/upload_prebuilts_unittest.py b/scripts/upload_prebuilts_unittest.py
index eade9ae..b62fdc6 100755
--- a/scripts/upload_prebuilts_unittest.py
+++ b/scripts/upload_prebuilts_unittest.py
@@ -16,6 +16,7 @@
 from chromite.lib import cros_build_lib
 from chromite.lib import cros_test_lib
 from chromite.lib import binpkg
+from chromite.lib import osutils
 
 # pylint: disable=E1120,W0212,R0904
 PUBLIC_PACKAGES = [{'CPV': 'gtk+/public1', 'SHA1': '1', 'MTIME': '1'},
@@ -42,9 +43,8 @@
                          'portage portage-20100310.tar.bz2',
                          'COMPILE_FLAGS="some_value=some_other"',
                          ]
-    temp_fd, self.version_file = tempfile.mkstemp()
-    os.write(temp_fd, '\n'.join(self.contents_str))
-    os.close(temp_fd)
+    self.version_file = os.path.join(self.tempdir, 'version')
+    osutils.WriteFile(self.version_file, '\n'.join(self.contents_str))
 
   def _read_version_file(self, version_file=None):
     """Read the contents of self.version_file and return as a list."""