fix test_pip_install_target

Author: lidong

test_utils.py

@@ -724,20 +724,26 @@ def test_pip_install_target():
         "./mock_dir", ["six", "--no-cache-dir"], force=False, sys_path=None
     )
     assert time.time() - start_time > 0.1
-    sys.modules.pop("six", None)
-    import six
+    try:
+        sys.modules.pop("six", None)
+        import six
 
-    assert "mock_dir" not in six.__file__
+        assert "mock_dir" not in six.__file__
+    except ImportError:
+        pass
     # hit md5 cache, force=False, sys_path ignored
     start_time = time.time()
     assert not pip_install_target(
         "./mock_dir", ["six", "--no-cache-dir"], force=False, sys_path=0
     )
     assert time.time() - start_time < 0.1
-    sys.modules.pop("six", None)
-    import six
+    try:
+        sys.modules.pop("six", None)
+        import six
 
-    assert "mock_dir" not in six.__file__
+        assert "mock_dir" not in six.__file__
+    except ImportError:
+        pass
     # test force=True, sys_path=0 worked
     start_time = time.time()
     assert pip_install_target(
@@ -759,7 +765,7 @@ def main():
     count = 0
     items = list(globals().items())
     total = len(items)
-    name_list = ''
+    name_list = ""
     for name, func in items:
         if name_list and name not in name_list:
             continue

zipapps/main.py

@@ -652,6 +652,8 @@ def pip_install_target(
     md5_path = target / ZipApp.get_md5(pip_args)
     if not force and md5_path.exists():
         return False
+    if force:
+        shutil.rmtree(target.as_posix())
     ZipApp._pip_install(target_dir=target, pip_args=pip_args)
     if rm_patterns:
         ZipApp._rm_with_patterns(target, patterns=rm_patterns.split(","))