Change the fake repo svn users to be emails.

tests/fake_repos.py

 #!/usr/bin/python
 # Copyright (c) 2010 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.
 
 """Generate fake repositories for testing."""
 
 import atexit
 import errno
 import logging
@@ skipping 138 matching lines @@
     if k not in dict2:
       diff[k] = v
     elif v != dict2[k]:
       diff[k] = (v, dict2[k])
   for k, v in dict2.iteritems():
     if k not in dict1:
       diff[k] = v
   return diff
 
 
-def commit_svn(repo):
+def commit_svn(repo, usr, pwd):
   """Commits the changes and returns the new revision number."""
   to_add = []
   to_remove = []
   for status, filepath in scm.SVN.CaptureStatus(repo):
     if status[0] == '?':
       to_add.append(filepath)
     elif status[0] == '!':
       to_remove.append(filepath)
   if to_add:
     check_call(['svn', 'add', '--no-auto-props', '-q'] + to_add, cwd=repo)
   if to_remove:
     check_call(['svn', 'remove', '-q'] + to_remove, cwd=repo)
-  proc = Popen(['svn', 'commit', repo, '-m', 'foo', '--non-interactive',
-                '--no-auth-cache', '--username', 'user1', '--password', 'foo'],
-               cwd=repo)
+  proc = Popen(
+      ['svn', 'commit', repo, '-m', 'foo', '--non-interactive',
+        '--no-auth-cache',
+        '--username', usr, '--password', pwd],
+      cwd=repo)
   out, err = proc.communicate()
   match = re.search(r'(\d+)', out)
   if not match:
     raise Exception('Commit failed', out, err, proc.returncode)
   rev = match.group(1)
   st = Popen(['svn', 'status'], cwd=repo).communicate()[0]
   assert len(st) == 0, st
   logging.debug('At revision %s' % rev)
   return rev
 
@@ skipping 21 matching lines @@
   populateSvn() and populateGit() need to be implemented by the subclass.
   """
 
   # Should leak the repositories.
   SHOULD_LEAK = False
   # Override if unhappy.
   TRIAL_DIR = None
   # Hostname
   HOST = '127.0.0.1'
   NB_GIT_REPOS = 1
+  USERS = [
+      ('user1@example.com', 'foo'),
+      ('user2@example.com', 'bar'),
+  ]
 
   def __init__(self, trial_dir=None, leak=None, host=None):
     global _FAKE_LOADED
     if _FAKE_LOADED:
       raise Exception('You can only start one FakeRepos at a time.')
     _FAKE_LOADED = True
     # Quick hack.
     if '-v' in sys.argv:
       logging.basicConfig(level=logging.DEBUG)
     elif leak is not None:
@@ skipping 73 matching lines @@
     root = join(self.repos_dir, 'svn')
     try:
       check_call(['svnadmin', 'create', root])
     except OSError:
       return False
     write(join(root, 'conf', 'svnserve.conf'),
         '[general]\n'
         'anon-access = read\n'
         'auth-access = write\n'
         'password-db = passwd\n')
-    write(join(root, 'conf', 'passwd'),
-        '[users]\n'
-        'user1 = foo\n'
-        'user2 = bar\n')
+    text = '[users]\n'
+    text += ''.join('%s = %s\n' % (usr, pwd) for usr, pwd in self.USERS)
+    write(join(root, 'conf', 'passwd'), text)
 
     # Start the daemon.
     cmd = ['svnserve', '-d', '--foreground', '-r', self.repos_dir]
     if self.HOST == '127.0.0.1':
       cmd.append('--listen-host=127.0.0.1')
     self.svnserve = Popen(cmd, cwd=root)
     self.populateSvn()
     return True
 
   def setUpGIT(self):
@@ skipping 10 matching lines @@
     # Start the daemon.
     cmd = ['git', 'daemon', '--export-all', '--base-path=' + self.repos_dir]
     if self.HOST == '127.0.0.1':
       cmd.append('--listen=127.0.0.1')
     logging.debug(cmd)
     self.gitdaemon = Popen(cmd, cwd=self.repos_dir)
     return True
 
   def _commit_svn(self, tree):
     self._genTree(self.svn_root, tree)
-    commit_svn(self.svn_root)
+    commit_svn(self.svn_root, self.USERS[0][0], self.USERS[0][1])
     if self.svn_revs and self.svn_revs[-1]:
       new_tree = self.svn_revs[-1].copy()
       new_tree.update(tree)
     else:
       new_tree = tree.copy()
     self.svn_revs.append(new_tree)
 
   def _commit_git(self, repo, tree):
     repo_root = join(self.git_root, repo)
     self._genTree(repo_root, tree)
@@ skipping 14 matching lines @@
 
 class FakeRepos(FakeReposBase):
   """Implements populateSvn() and populateGit()."""
   NB_GIT_REPOS = 4
 
   def populateSvn(self):
     """Creates a few revisions of changes including DEPS files."""
     # Repos
     check_call(['svn', 'checkout', 'svn://127.0.0.1/svn', self.svn_root, '-q',
                 '--non-interactive', '--no-auth-cache',
-                '--username', 'user1', '--password', 'foo'])
+                '--username', self.USERS[0][0], '--password', self.USERS[0][1]])
     assert os.path.isdir(join(self.svn_root, '.svn'))
     def file_system(rev, DEPS):
       fs = {
         'origin': 'svn@%(rev)d\n',
         'trunk/origin': 'svn/trunk@%(rev)d\n',
         'trunk/src/origin': 'svn/trunk/src@%(rev)d\n',
         'trunk/src/third_party/origin': 'svn/trunk/src/third_party@%(rev)d\n',
         'trunk/other/origin': 'src/trunk/other@%(rev)d\n',
         'trunk/third_party/origin': 'svn/trunk/third_party@%(rev)d\n',
         'trunk/third_party/foo/origin': 'svn/trunk/third_party/foo@%(rev)d\n',
@@ skipping 299 matching lines @@
 
 
 # Kind of hack.
 if '-l' in sys.argv:
   FakeRepos.SHOULD_LEAK = True
   sys.argv.remove('-l')
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))