commit 3e631421d257eec7478186fb92fae167be7e95f0
author Andrii Shyshkalov <tandrii@chromium.org> Thu Feb 16 17:46:44 2017 +0100
committer Commit Bot <commit-bot@chromium.org> Fri Feb 17 14:24:46 2017 +0000
tree 1097798343f5323a29ef4e837a556735eb8ebfe0
parent 4dc0b2a33d63347c7cd80df81fec58320555a472

Gerrit git cl upload: abort early if change is submitted or abandoned.

BUG=689652
R=agable@chromium.org,martiniss@chromium.org

Change-Id: Ib9f5b08f5b31a1519a5f5916042885967a263d88
Reviewed-on: https://chromium-review.googlesource.com/443325
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>

tests/git_cl_test.py

diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index a2e3733..3d97726 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -1152,9 +1152,20 @@
            'refs/remotes/origin/master'],),
          'fake_ancestor_sha'),
         # Calls to verify branch point is ancestor
-      ] + (cls._gerrit_ensure_auth_calls(issue=issue) +
-           cls._git_sanity_checks('fake_ancestor_sha', 'master',
-                                  get_remote_branch=False)) + [
+      ] + cls._gerrit_ensure_auth_calls(issue=issue) + ([
+        (('GetChangeDetail', 'chromium-review.googlesource.com',
+          '123456', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
+         {
+           'change_id': '123456789',
+           'current_revision': 'sha1_of_current_revision',
+           'revisions': { 'sha1_of_current_revision': {
+             'commit': {'message': fetched_description},
+           }},
+           'status': 'NEW',
+         }),
+      ] if issue else [
+      ]) + cls._git_sanity_checks('fake_ancestor_sha', 'master',
+                                  get_remote_branch=False) + [
         ((['git', 'rev-parse', '--show-cdup'],), ''),
         ((['git', 'rev-parse', 'HEAD'],), '12345'),
 
@@ -1164,15 +1175,6 @@
          'M\t.gitignore\n'),
         ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
       ] + ([
-        (('GetChangeDetail', 'chromium-review.googlesource.com',
-          '123456', ['CURRENT_REVISION', 'CURRENT_COMMIT']),
-         {
-           'change_id': '123456789',
-           'current_revision': 'sha1_of_current_revision',
-           'revisions': { 'sha1_of_current_revision': {
-             'commit': {'message': fetched_description},
-           }},
-         }),
       ] if issue else [
         ((['git',
            'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),