Make --send-mail more useful by not requiring -r

tests/git_cl_test.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.
 
 """Unit tests for git_cl.py."""
 
 import os
+import StringIO
 import sys
 import unittest
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from testing_support.auto_stub import TestCase
 
 import git_cl
 import subprocess2
 
@@ skipping 43 matching lines @@
         return ['joe@example.com']
     self.mock(git_cl.watchlists, 'Watchlists', WatchlistsMock)
     # It's important to reset settings to not have inter-tests interference.
     git_cl.settings = None
 
   def tearDown(self):
     if not self.has_failed():
       self.assertEquals([], self.calls)
     super(TestGitCl, self).tearDown()
 
+  @classmethod
+  def _upload_calls(cls):
+    return cls._git_base_calls() + cls._git_upload_calls()
+
   @staticmethod
-  def _upload_calls():
+  def _git_base_calls():
     return [
         (['git', 'update-index', '--refresh', '-q'], ''),
         (['git', 'diff-index', 'HEAD'], ''),
         (['git', 'config', 'rietveld.server'], 'codereview.example.com'),
         (['git', 'symbolic-ref', 'HEAD'], 'master'),
         (['git', 'config', 'branch.master.merge'], 'master'),
         (['git', 'config', 'branch.master.remote'], 'origin'),
         (['git', 'rev-parse', '--show-cdup'], ''),
         (['git', 'rev-parse', 'HEAD'], '12345'),
         (['git', 'diff', '--name-status', '-r', 'master...', '.'],
           'M\t.gitignore\n'),
         (['git', 'rev-parse', '--git-dir'], '.git'),
         (['git', 'config', 'branch.master.rietveldissue'], ''),
         (['git', 'config', 'branch.master.rietveldpatchset'], ''),
         (['git', 'log', '--pretty=format:%s%n%n%b', 'master...'], 'foo'),
         (['git', 'config', 'user.email'], 'me@example.com'),
         (['git', 'diff', '--no-ext-diff', '--stat', '-M', 'master...'], '+dat'),
         (['git', 'log', '--pretty=format:%s\n\n%b', 'master..'], 'desc\n'),
+    ]
+
+  @staticmethod
+  def _git_upload_calls():
+    return [
         (['git', 'config', 'rietveld.cc'], ''),
         (['git', 'config', '--get-regexp', '^svn-remote\\.'], (('', None), 0)),
         (['git', 'rev-parse', '--show-cdup'], ''),
         (['git', 'svn', 'info'], ''),
         (['git', 'config', 'branch.master.rietveldissue', '1'], ''),
         (['git', 'config', 'branch.master.rietveldserver',
           'http://codereview.example.com'], ''),
         (['git', 'config', 'branch.master.rietveldpatchset', '2'], ''),
     ]
 
@@ skipping 68 matching lines @@
     # Handles multiple R= or TBR= lines.
     description = (
         'Foo Bar\nTBR=reviewer@example.com\nBUG=\nR=another@example.com\n')
     self._run_reviewer_test(
         [],
         'desc\n\nBUG=\nTEST=\n',
         description,
         description,
         ['--reviewers', 'reviewer@example.com,another@example.com'])
 
+  def test_reviewer_send_mail(self):
+    # --send-mail can be used without -r if R= is used
+    description = 'Foo Bar\nR=reviewer@example.com\n'
+    self._run_reviewer_test(
+        ['--send-mail'],
+        'desc\n\nBUG=\nTEST=\n',
+        description.strip('\n'),
+        description,
+        ['--reviewers', 'reviewer@example.com', '--send_mail'])
+
+  def test_reviewer_send_mail_no_rev(self):
+    # Fails without a reviewer.
+    class FileMock(object):
+      buf = StringIO.StringIO()
+      def write(self, content):
+        self.buf.write(content)
+
+    mock = FileMock()
+    try:
+      self.calls = self._git_base_calls()
+      def RunEditor(desc, _):
+        return desc
+      self.mock(git_cl.gclient_utils, 'RunEditor', RunEditor)
+      self.mock(sys, 'stderr', mock)
+      git_cl.main(['upload', '--send-mail'])
+      self.fail()
+    except SystemExit:
+      self.assertEquals(
+          'Must specify reviewers to send email.\n', mock.buf.getvalue())
+
 
 if __name__ == '__main__':
   unittest.main()