commit f53bd3a75b8ba2feaa79101b011d67a3d4bbe052
author Daniel Erat <derat@chromium.org> Fri Dec 02 11:28:36 2016 -0700
committer chrome-bot <chrome-bot@chromium.org> Fri Dec 02 16:52:59 2016 -0800
tree cc0e702040426762cfe3941cdaac11b7c4cd183c
parent be2f57e611a11073f5d5520380b5cf529d1e1d55

chromite: Remove envoy references.

BUG=chromium:656133
TEST=ran deploy_chrome_unittest

Change-Id: Ic4672387f414726e92879c51abca96debd76d6ed
Reviewed-on: https://chromium-review.googlesource.com/416188
Commit-Ready: Dan Erat <derat@chromium.org>
Tested-by: Dan Erat <derat@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

scripts/deploy_chrome_unittest.py

diff --git a/scripts/deploy_chrome_unittest.py b/scripts/deploy_chrome_unittest.py
index 3ef22c0..6579090 100644
--- a/scripts/deploy_chrome_unittest.py
+++ b/scripts/deploy_chrome_unittest.py
@@ -296,15 +296,6 @@
 class TestDeploymentType(DeployTestBuildDir):
   """Test detection of deployment type using build dir."""
 
-  def testEnvoyDetection(self):
-    """Check for an envoy deployment"""
-    osutils.Touch(os.path.join(self.deploy.options.build_dir, 'envoy_shell'),
-                  makedirs=True)
-    self.deploy._CheckDeployType()
-    self.assertTrue(self.getCopyPath('envoy_shell'))
-    self.assertFalse(self.getCopyPath('app_shell'))
-    self.assertFalse(self.getCopyPath('chrome'))
-
   def testAppShellDetection(self):
     """Check for an app_shell deployment"""
     osutils.Touch(os.path.join(self.deploy.options.build_dir, 'app_shell'),
@@ -312,20 +303,16 @@
     self.deploy._CheckDeployType()
     self.assertTrue(self.getCopyPath('app_shell'))
     self.assertFalse(self.getCopyPath('chrome'))
-    self.assertFalse(self.getCopyPath('envoy_shell'))
 
   def testChromeAndAppShellDetection(self):
-    """Check for a chrome deployment when app_shell/envoy_shell also exist."""
+    """Check for a chrome deployment when app_shell also exists."""
     osutils.Touch(os.path.join(self.deploy.options.build_dir, 'chrome'),
                   makedirs=True)
     osutils.Touch(os.path.join(self.deploy.options.build_dir, 'app_shell'),
                   makedirs=True)
-    osutils.Touch(os.path.join(self.deploy.options.build_dir, 'envoy_shell'),
-                  makedirs=True)
     self.deploy._CheckDeployType()
     self.assertTrue(self.getCopyPath('chrome'))
     self.assertFalse(self.getCopyPath('app_shell'))
-    self.assertFalse(self.getCopyPath('envoy_shell'))
 
   def testChromeDetection(self):
     """Check for a regular chrome deployment"""
@@ -334,4 +321,3 @@
     self.deploy._CheckDeployType()
     self.assertTrue(self.getCopyPath('chrome'))
     self.assertFalse(self.getCopyPath('app_shell'))
-    self.assertFalse(self.getCopyPath('envoy_shell'))