Revert of Refactor serving_dirs.

tools/telemetry/telemetry/unittest_util/system_stub.py

 # Copyright 2012 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.
 
 """Provides stubs for os, sys and subprocess for testing
 
 This test allows one to test code that itself uses os, sys, and subprocess.
 """
 
 import os
@@ skipping 273 matching lines @@
     result = CloudStorageModuleStub.GetHelper(
         self, self.PUBLIC_BUCKET, remote_path, local_path, True)
     if not result:
       result = CloudStorageModuleStub.GetHelper(
           self, self.PARTNER_BUCKET, remote_path, local_path, True)
     if not result:
       result = CloudStorageModuleStub.GetHelper(
           self, self.INTERNAL_BUCKET, remote_path, local_path, True)
     return result
 
-  def GetFilesInDirectoryIfChanged(self, directory, bucket):
-    if os.path.dirname(directory) == directory: # If in the root dir.
-      raise ValueError('Trying to serve root directory from HTTP server.')
-    for dirpath, _, filenames in os.walk(directory):
-      for filename in filenames:
-        path, extension = os.path.splitext(
-            os.path.join(dirpath, filename))
-        if extension != '.sha1':
-          continue
-        self.GetIfChanged(path, bucket)
-
   def CalculateHash(self, file_path):
     return self.local_file_hashes[file_path]
 
   def ReadHash(self, hash_path):
     return self.local_hash_files[hash_path]
 
 
 class LoggingStub(object):
   def __init__(self):
     self.warnings = []
@@ skipping 44 matching lines @@
 
 class OsModuleStub(object):
   class OsEnvironModuleStub(object):
     def get(self, _):
       return None
 
   class OsPathModuleStub(object):
     def __init__(self, sys_module):
       self.sys = sys_module
       self.files = []
-      self.dirs = []
 
     def exists(self, path):
       return path in self.files
 
     def isfile(self, path):
       return path in self.files
 
-    def isdir(self, path):
-      return path in self.dirs
-
     def join(self, *paths):
       def IsAbsolutePath(path):
         if self.sys.platform.startswith('win'):
           return re.match('[a-zA-Z]:\\\\', path)
         else:
           return path.startswith('/')
 
       # Per Python specification, if any component is an absolute path,
       # discard previous components.
       for index, path in reversed(list(enumerate(paths))):
         if IsAbsolutePath(path):
           paths = paths[index:]
           break
 
       if self.sys.platform.startswith('win'):
         tmp = os.path.join(*paths)
         return tmp.replace('/', '\\')
       else:
         tmp = os.path.join(*paths)
         return tmp.replace('\\', '/')
 
     @staticmethod
-    def abspath(path):
-      return os.path.abspath(path)
-
-    @staticmethod
     def expanduser(path):
       return os.path.expanduser(path)
 
     @staticmethod
     def dirname(path):
       return os.path.dirname(path)
 
     @staticmethod
     def splitext(path):
       return os.path.splitext(path)
 
-    @staticmethod
-    def splitdrive(path):
-      return os.path.splitdrive(path)
-
   X_OK = os.X_OK
 
-  sep = os.sep
   pathsep = os.pathsep
 
   def __init__(self, sys_module=sys):
     self.path = OsModuleStub.OsPathModuleStub(sys_module)
     self.environ = OsModuleStub.OsEnvironModuleStub()
     self.display = ':0'
     self.local_app_data = None
     self.sys_path = None
     self.program_files = None
     self.program_files_x86 = None
     self.devnull = os.devnull
-    self._directory = {}
 
   def access(self, path, _):
     return path in self.path.files
 
   def getenv(self, name, value=None):
     if name == 'DISPLAY':
       env = self.display
     elif name == 'LOCALAPPDATA':
       env = self.local_app_data
     elif name == 'PATH':
       env = self.sys_path
     elif name == 'PROGRAMFILES':
       env = self.program_files
     elif name == 'PROGRAMFILES(X86)':
       env = self.program_files_x86
     else:
       raise NotImplementedError('Unsupported getenv')
     return env if env else value
 
   def chdir(self, path):
     pass
 
-  def walk(self, top):
-    for dir_name in self._directory:
-      yield top, dir_name, self._directory[dir_name]
-
 
 class PerfControlModuleStub(object):
   class PerfControlStub(object):
     def __init__(self, adb):
       pass
 
   def __init__(self):
     self.PerfControl = PerfControlModuleStub.PerfControlStub
 
 
@@ skipping 60 matching lines @@
 class AdbInstallCertStub(object):
   class AndroidCertInstaller(object):
     def __init__(self, device_id, _cert_name, _cert_path):
       if device_id == 'success':
         pass
       elif device_id == 'failure':
         raise Exception('Test exception.')
 
     def install_cert(self, overwrite_cert=False):
       pass