Disable the use of -s or --server with gcl upload.

tests/gcl_unittest.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.
 
 """Unit tests for gcl.py."""
 
 # Fixes include path.
 from super_mox import mox, SuperMoxTestBase
 
@@ skipping 307 matching lines @@
     gcl.sys.stdout.write("\n")
     gcl.GetRepositoryRoot().AndReturn(self.fake_root_dir)
     gcl.ChangeInfo.Load('naame', self.fake_root_dir, True, True
         ).AndReturn(change_info)
     self.mox.ReplayAll()
 
     gcl.CMDupload(['naame', '--no_watchlists'])
     self.assertEquals(change_info.issue, 1)
     self.assertEquals(change_info.patchset, 2)
 
+  def testNoServer(self):
+    self.mox.StubOutWithMock(gcl.sys, 'stderr')
+    gcl.sys.stderr.write(
+        'Don\'t use the -s flag, fix codereview.settings instead')
+    gcl.sys.stderr.write('\n')
+    gcl.GetRepositoryRoot().AndReturn(self.fake_root_dir)
+    gcl.ChangeInfo.Load('naame', self.fake_root_dir, True, True
+        ).AndReturn(1)
+    self.mox.ReplayAll()
+
+    try:
+      gcl.CMDupload(['naame', '-s', 'foo'])
+      self.fail()
+    except SystemExit:
+      pass
+
 
 if __name__ == '__main__':
   import unittest
   unittest.main()