Fix linting errors

smarkets · Mar 1, 2019 · 1560707 · 1560707
1 parent 97ef9dc
commit 1560707
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/marge/app.py b/marge/app.py
@@ -118,7 +118,7 @@ def regexp(str_regex):
             "built-in rebase functionality, via their API. Note that Marge can't add\n"
             "information in the commits in this case.\n"
         ),
-    ),
+    )
     parser.add_argument(
         '--add-tested',
         action='store_true',

diff --git a/tests/test_app.py b/tests/test_app.py
@@ -150,17 +150,19 @@ def test_add_reviewers():
             assert bot.config.merge_opts != job.MergeJobOptions.default()
             assert bot.config.merge_opts == job.MergeJobOptions.default(add_reviewers=True)
 
+
 def test_rebase_remotely_option_conflicts():
     for conflicting_flag in ['--use-merge-strategy', '--add-tested', '--add-part-of', '--add-reviewers']:
         with env(MARGE_AUTH_TOKEN="NON-ADMIN-TOKEN", MARGE_SSH_KEY="KEY", MARGE_GITLAB_URL='http://foo.com'):
             with pytest.raises(app.MargeBotCliArgError):
-                with main('--rebase-remotely %s' % conflicting_flag) as bot:
+                with main('--rebase-remotely %s' % conflicting_flag):
                     pass
 
+
 def test_impersonate_approvers():
     with env(MARGE_AUTH_TOKEN="NON-ADMIN-TOKEN", MARGE_SSH_KEY="KEY", MARGE_GITLAB_URL='http://foo.com'):
         with pytest.raises(AssertionError):
-            with main('--impersonate-approvers') as bot:
+            with main('--impersonate-approvers'):
                 pass
 
     with env(MARGE_AUTH_TOKEN="ADMIN-TOKEN", MARGE_SSH_KEY="KEY", MARGE_GITLAB_URL='http://foo.com'):