devserver: introduce --datadir option to override where devserver puts static

devserver_test.py

 #!/usr/bin/python
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Regression tests for devserver."""
 
 import os
 import signal
 import shutil
 import subprocess
 import sys
 import time
 import unittest
 import urllib2
 from xml.dom import minidom
 
 # Paths are relative to this script's base directory.
 STATIC_DIR = 'static'
-TEST_IMAGE = 'testdata/devserver/developer-test.gz'
+TEST_IMAGE_PATH = 'testdata/devserver'
+TEST_IMAGE_NAME = 'developer-test.gz'
+TEST_IMAGE = TEST_IMAGE_PATH + '/' + TEST_IMAGE_NAME
 TEST_FACTORY_CONFIG = 'testdata/devserver/miniomaha-test.conf'
+TEST_DATA_PATH = '/tmp/devserver-test'
 
 # TODO(girts): Get a copy of a recent request.  For now, I copied this from
 # update_test.
 UPDATE_REQUEST = """<?xml version="1.0" encoding="UTF-8"?>
 <o:gupdate
   xmlns:o="http://www.google.com/update2/request"
   version="MementoSoftwareUpdate-0.1.0.0"
   protocol="2.0"
   machineid="{1B0A13AC-7004-638C-3CA6-EC082E8F5DE9}"
   ismachine="0"
@@ skipping 22 matching lines @@
 
 class DevserverTest(unittest.TestCase):
   """Regressions tests for devserver."""
 
   def setUp(self):
     """Copies in testing files."""
 
     # Copy in developer-test.gz, as "static/" directory is hardcoded, and it
     # would be very hard to change it (static file serving is handled deep
     # inside webpy).
-    image_src = os.path.join(base_dir, TEST_IMAGE)
-    self.image = os.path.join(base_dir, STATIC_DIR, 'developer-test.gz')
+    self.image_src = os.path.join(base_dir, TEST_IMAGE)
+    self.image = os.path.join(base_dir, STATIC_DIR, TEST_IMAGE_NAME)
     if os.path.exists(self.image):
       os.unlink(self.image)
-    shutil.copy(image_src, self.image)
+    shutil.copy(self.image_src, self.image)
 
     self.factory_config = os.path.join(base_dir, TEST_FACTORY_CONFIG)
 
   def tearDown(self):
     """Removes testing files."""
     if os.path.exists(self.image):
       os.unlink(self.image)
 
   def testValidateFactoryConfig(self):
     """Tests --validate_factory_config."""
     cmd = [
         'python',
         os.path.join(base_dir, 'devserver.py'),
         '--validate_factory_config',
         '--factory_config', self.factory_config,
     ]
     process = subprocess.Popen(cmd, stdout=subprocess.PIPE)
     stdout, _ = process.communicate()
     self.assertEqual(0, process.returncode)
     self.assertTrue('Config file looks good.' in stdout)
 
-  def _StartServer(self):
+  def _StartServer(self,datadir=''):

[davidjames, 2011/02/11 23:31:53]

space after comma

     """Starts devserver, returns process."""
     cmd = [
         'python',
         os.path.join(base_dir, 'devserver.py'),
         'devserver.py',
         '--factory_config', self.factory_config,
     ]
+    if datadir:
+      cmd.append('--datadir')
+      cmd.append(datadir)
     process = subprocess.Popen(cmd)
     return process.pid
 
   def testHandleUpdate(self):
     """Tests running the server and getting an update."""
     pid = self._StartServer()
     try:
       # Wait for the server to start up.
       time.sleep(1)
       request = urllib2.Request(UPDATE_URL, UPDATE_REQUEST)
       connection = urllib2.urlopen(request)
       response = connection.read()

[davidjames, 2011/02/11 23:31:53]

connection.close()

       self.assertNotEqual('', response)
 
       # Parse the response and check if it contains the right result.
       dom = minidom.parseString(response)
       update = dom.getElementsByTagName('updatecheck')[0]
 
       codebase = update.getAttribute('codebase')
-      self.assertEqual('http://127.0.0.1:8080/static/developer-test.gz',
+      self.assertEqual('http://127.0.0.1:8080/static/' + TEST_IMAGE_NAME,
                        codebase)
 
       hash_value = update.getAttribute('hash')
       self.assertEqual('kGcOinJ0vA8vdYX53FN0F5BdwfY=', hash_value)
 
       # Try to fetch the image.
       connection = urllib2.urlopen(codebase)
       contents = connection.read()

[davidjames, 2011/02/11 23:31:53]

connection.close()

       self.assertEqual('Developers, developers, developers!\n', contents)
     finally:
       os.kill(pid, signal.SIGKILL)
 
+  def testHandleDatadirUpdate(self):
+    """Tests getting an update from a specified datadir"""
+    pid = self._StartServer(datadir=TEST_DATA_PATH)
+    try:
+      # Wait for the server to start up.
+      time.sleep(1)

[davidjames, 2011/02/11 23:31:53]

I see you copied this from above. This sleep seems a bit flaky though...

+      # If we copy the test image here, devserver has taken care of creation
+      # of the directories for us by now.
+      foreign_image = os.path.join(TEST_DATA_PATH,
+        STATIC_DIR + '/' + TEST_IMAGE_NAME)

[davidjames, 2011/02/11 23:31:53]

continued lines have 4 space indent. Also, why not just do
os.path.join(TEST_DATA_PATH, STATIC_DIR, TEST_IMAGE_NAME)

+      if os.path.exists(foreign_image):
+        os.unlink(foreign_image)
+      shutil.copy(self.image_src, foreign_image)
+
+      request = urllib2.Request(UPDATE_URL, UPDATE_REQUEST)
+      connection = urllib2.urlopen(request)
+      response = connection.read()

[davidjames, 2011/02/11 23:31:53]

connection.close()

+      self.assertNotEqual('', response)
+
+      # Parse the response and check if it contains the right result.
+      dom = minidom.parseString(response)
+      update = dom.getElementsByTagName('updatecheck')[0]
+
+      codebase = update.getAttribute('codebase')
+      self.assertEqual('http://127.0.0.1:8080/static/' + TEST_IMAGE_NAME,
+                       codebase)
+
+      hash_value = update.getAttribute('hash')
+      self.assertEqual('kGcOinJ0vA8vdYX53FN0F5BdwfY=', hash_value)
+
+      # Try to fetch the image.
+      connection = urllib2.urlopen(codebase)
+      contents = connection.read()

[davidjames, 2011/02/11 23:31:53]

connection.close()

+      self.assertEqual('Developers, developers, developers!\n', contents)
+      os.unlink(foreign_image)
+    finally:
+      os.kill(pid, signal.SIGKILL)
+
 
 if __name__ == '__main__':
   unittest.main()