Improve search algorithm for GAE SDK in depot_tools integration tests.

depot_tools/tests/local_rietveld.py

 #!/usr/bin/env python
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Setups a local Rietveld instance to test against a live server for
 integration tests.
 
 It makes sure Google AppEngine SDK is found, download Rietveld and Django code
 if necessary and starts the server on a free inbound TCP port.
@@ skipping 33 matching lines @@
 
 
 class LocalRietveld(object):
   """Downloads everything needed to run a local instance of Rietveld."""
 
   def __init__(self, base_dir=None):
     # Paths
     self.base_dir = base_dir
     if not self.base_dir:
       self.base_dir = os.path.dirname(os.path.abspath(__file__))
-      self.base_dir = os.path.realpath(os.path.join(self.base_dir, '..'))
-    self.sdk_path = os.path.abspath(
-        os.path.join(self.base_dir, '..', 'google_appengine'))
-    self.dev_app = os.path.join(self.sdk_path, 'dev_appserver.py')
-    self.rietveld = os.path.join(self.base_dir, 'tests', '_rietveld')
+    # TODO(maruel): This should be in /tmp but that would mean having to fetch
+    # everytime. This test is already annoyingly slow.
+    self.rietveld = os.path.join(self.base_dir, '_rietveld')
     self.test_server = None
     self.port = None
 
+    # Find the GAE SDK
+    previous_dir = ''
+    self.sdk_path = ''
+    base_dir = self.base_dir
+    while base_dir != previous_dir:
+      previous_dir = base_dir
+      self.sdk_path = os.path.join(base_dir, 'google_appengine')
+      if not os.path.isfile(os.path.join(self.sdk_path, 'VERSION')):
+        base_dir = os.path.dirname(base_dir)
+    self.dev_app = os.path.join(self.sdk_path, 'dev_appserver.py')
+
   def install_prerequisites(self):
     # First, verify the Google AppEngine SDK is available.
     if not os.path.isfile(self.dev_app):
-      raise Failure('Install google_appengine sdk in %s' % self.sdk_path)
+      raise Failure(
+          'Install google_appengine sdk in %s or higher up' % self.base_dir)
 
     # Second, checkout rietveld if not available.
     if not os.path.isdir(self.rietveld):
       print('Checking out rietveld...')
       try:
         subprocess2.check_call(
             ['svn', 'co', '-q', 'http://rietveld.googlecode.com/svn/trunk@681',
              self.rietveld])
       except (OSError, subprocess2.CalledProcessError), e:
         raise Failure('Failed to checkout rietveld\n%s' % e)
@@ skipping 50 matching lines @@
     instance.start_server(verbose=options.verbose)
     print 'Local rietveld instance started on port %d' % instance.port
     while True:
       time.sleep(0.1)
   finally:
     instance.stop_server()
 
 
 if __name__ == '__main__':
   main()