Add an assert to ensure UTF-8 locale when handling file paths.

client/tests/zip_package_test.py

 #!/usr/bin/env python
 # Copyright 2013 The Swarming Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0 that
 # can be found in the LICENSE file.
 
 import cStringIO as StringIO
 import logging
 import os
-import shutil
 import subprocess
 import sys
 import tempfile
 import unittest
 import zipfile
 
 ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 sys.path.insert(0, ROOT_DIR)
 
+from third_party.depot_tools import fix_encoding
+from utils import file_path
 from utils import zip_package
 
 
 def check_output(*args, **kwargs):
   return  subprocess.check_output(*args, stderr=subprocess.STDOUT, **kwargs)
 
 
 class ZipPackageTest(unittest.TestCase):
   def setUp(self):
     super(ZipPackageTest, self).setUp()
     self.temp_dir = tempfile.mkdtemp(prefix=u'zip_package_test')
 
   def tearDown(self):
-    shutil.rmtree(self.temp_dir)
-    super(ZipPackageTest, self).tearDown()
+    try:
+      file_path.rmtree(self.temp_dir)
+    finally:
+      super(ZipPackageTest, self).tearDown()
 
   def stage_files(self, files):
     """Populates temp directory with given files specified as a list or dict."""
     if not isinstance(files, dict):
       files = dict((p, '') for p in files)
     for path, content in files.iteritems():
       abs_path = os.path.join(self.temp_dir, path.replace('/', os.sep))
       dir_path = os.path.dirname(abs_path)
       if not os.path.exists(dir_path):
         os.makedirs(dir_path)
@@ skipping 231 matching lines @@
     zip_file = os.path.join(self.temp_dir, 'out.zip')
     pkg.zip_into_file(zip_file)
     actual = check_output([sys.executable, zip_file]).strip()
     expected = os.path.join(
         self.temp_dir,
         '321690737f78d081937f88c3fd0e625dd48ae07d-cert.pem')
     self.assertEqual(expected, actual)
 
 
 if __name__ == '__main__':
+  fix_encoding.fix_encoding()
   VERBOSE = '-v' in sys.argv
   logging.basicConfig(level=logging.DEBUG if VERBOSE else logging.ERROR)
   unittest.main()