commit e7d564ab76aabb175fa5982691e3da2294e0d561
author Achuith Bhandarkar <achuith@chromium.org> Wed Jan 17 10:23:52 2018 -0800
committer chrome-bot <chrome-bot@chromium.org> Fri Jan 19 00:29:46 2018 -0800
tree bcb9dd3ae08d98cd875c7a0eb410c9ba98ae281e
parent 8cd2a1c6b37480959bd001f932904b74b1f1d2b2

[cros_vm]: Use separate directories for different ports.

This allows us to launch multiple VMs with different ports.

BUG=chromium:782664
TEST=Launch multiple VMs with different ports.

Change-Id: I5a443d9d4e406a49d57e9ea8788fe42b7c4021e0
Reviewed-on: https://chromium-review.googlesource.com/871140
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Achuith Bhandarkar <achuith@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

scripts/cros_vm.py

diff --git a/scripts/cros_vm.py b/scripts/cros_vm.py
index 8139953..89f6976 100644
--- a/scripts/cros_vm.py
+++ b/scripts/cros_vm.py
@@ -62,7 +62,8 @@
     self.stop = opts.stop
     self.cmd = opts.args[1:] if opts.cmd else None
 
-    self.vm_dir = os.path.join(osutils.GetGlobalTempDir(), 'cros_vm')
+    self.vm_dir = os.path.join(osutils.GetGlobalTempDir(),
+                               'cros_vm_%d' % self.ssh_port)
     if os.path.exists(self.vm_dir):
       # For security, ensure that vm_dir is not a symlink, and is owned by us or
       # by root.