old_contents: # vim: tabstop=4 shiftwidth=4 softtabstop=4
  
  # Copyright 2012 OpenStack, LLC
  # All Rights Reserved.
  #
  #    Licensed under the Apache License, Version 2.0 (the "License"); you may
  #    not use this file except in compliance with the License. You may obtain
  #    a copy of the License at
  #
  #         http://www.apache.org/licenses/LICENSE-2.0
  #
  #    Unless required by applicable law or agreed to in writing, software
  #    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
  #    License for the specific language governing permissions and limitations
  #    under the License.
  
  import time
  
  import httplib2
  
  from glance.tests import functional
  from glance.tests.utils import execute
  
  
  class TestMultiprocessing(functional.FunctionalTest):
      """Functional tests for the bin/glance CLI tool"""
  
      def setUp(self):
          self.workers = 2
          super(TestMultiprocessing, self).setUp()
  
      def test_multiprocessing(self):
          """Spin up the api servers with multiprocessing on"""
          self.cleanup()
          self.start_servers(**self.__dict__.copy())
  
          path = "http://%s:%d/v1/images" % ("0.0.0.0", self.api_port)
          http = httplib2.Http()
          response, content = http.request(path, 'GET')
          self.assertEqual(response.status, 200)
          self.assertEqual(content, '{"images": []}')
          self.stop_servers()
  
      def _get_children(self):
          cmd = ("ps -fu $USER | grep glance-api | "
                 "grep -v grep | awk '{print $2}' | sort -nr")
          _, out, _ = execute(cmd, raise_error=True)
          return out.split('\n')[0:-2]
  
      def test_interrupt_avoids_respawn_storm(self):
          """
          Ensure an interrupt signal does not cause a respawn storm.
          See bug #978130
          """
          self.cleanup()
          self.start_servers(**self.__dict__.copy())
  
          children = self._get_children()
          cmd = "kill -INT %s" % ' '.join(children)
          execute(cmd, raise_error=True)
  
          for _ in range(0, 9):
              time.sleep(0.05)
              # ensure number of children hasn't grown
              self.assertTrue(len(children) > len(self._get_children()))
              for child in self._get_children():
                  # ensure no new children spawned
                  self.assertTrue(child in children)
  
          self.stop_servers()
  
new_contents: # vim: tabstop=4 shiftwidth=4 softtabstop=4
  
  # Copyright 2012 OpenStack, LLC
  # All Rights Reserved.
  #
  #    Licensed under the Apache License, Version 2.0 (the "License"); you may
  #    not use this file except in compliance with the License. You may obtain
  #    a copy of the License at
  #
  #         http://www.apache.org/licenses/LICENSE-2.0
  #
  #    Unless required by applicable law or agreed to in writing, software
  #    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
  #    License for the specific language governing permissions and limitations
  #    under the License.
  
  import time
  
  import httplib2
  
  from glance.tests import functional
  from glance.tests.utils import execute
  
  
  class TestMultiprocessing(functional.FunctionalTest):
      """Functional tests for the bin/glance CLI tool"""
  
      def setUp(self):
          self.workers = 2
          super(TestMultiprocessing, self).setUp()
  
      def test_multiprocessing(self):
          """Spin up the api servers with multiprocessing on"""
          self.cleanup()
          self.start_servers(**self.__dict__.copy())
  
          path = "http://%s:%d/v1/images" % ("0.0.0.0", self.api_port)
          http = httplib2.Http()
          response, content = http.request(path, 'GET')
          self.assertEqual(response.status, 200)
          self.assertEqual(content, '{"images": []}')
          self.stop_servers()
  
      def _get_children(self):
          cmd = ("ps -fu $USER | grep glance-api | "
                 "grep -v grep | awk '{print $2}' | sort -nr")
          _, out, _ = execute(cmd, raise_error=True)
          return out.split('\n')[0:2]
  
      def test_interrupt_avoids_respawn_storm(self):
          """
          Ensure an interrupt signal does not cause a respawn storm.
          See bug #978130
          """
          self.cleanup()
          self.start_servers(**self.__dict__.copy())
  
          children = self._get_children()
          cmd = "kill -INT %s" % ' '.join(children)
          execute(cmd, raise_error=True)
  
          for _ in range(0, 9):
              time.sleep(0.05)
              # ensure number of children hasn't grown
              self.assertTrue(len(children) >= len(self._get_children()))
              for child in self._get_children():
                  # ensure no new children spawned
                  self.assertTrue(child in children)
  
          self.stop_servers()
  
subject: Fix glance-api process leak in respawn storm test.