Lint fixes

oppia · U8NWXD · Dec 19, 2020 · Nov 25, 2020 · Nov 25, 2020 · Nov 25, 2020
commit 1826229dd22bc2ffabee1febc98723a1ed1b5021
@@ -52,7 +52,7 @@
     }
 }
 
-RequestExceptions = (
+REQUEST_EXCEPTIONS = (
     requests.RequestException, requests.ConnectionError,
     requests.HTTPError, requests.TooManyRedirects, requests.Timeout)
 
@@ -117,7 +117,7 @@ def report_pass(suite_name):
             PASS_REPORT_URL, json=payload,
             allow_redirects=False,
             headers={'report_key': REPORT_API_KEY})
-    except RequestExceptions as e:
+    except REQUEST_EXCEPTIONS as e:
         _print_color_message((
             'Failed to contact E2E test logging server at %s.'
             'Please report to E2E team in case server is down.'
@@ -138,7 +138,7 @@ def is_test_output_flaky(output_lines, suite_name):
             FLAKE_CHECK_AND_REPORT_URL, json=payload,
             allow_redirects=False,
             headers={'report_key': REPORT_API_KEY})
-    except RequestExceptions as e:
+    except REQUEST_EXCEPTIONS as e:
         _print_color_message((
             'Failed to contact E2E test logging server at %s.'
             'Please report to E2E team in case server is down.'

@@ -17,26 +17,15 @@
 from __future__ import absolute_import  # pylint: disable=import-only-modules
 from __future__ import unicode_literals  # pylint: disable=import-only-modules
 
-import atexit
-import contextlib
-import functools
-import os
-import re
-import signal
-import subprocess
-import sys
-import time
-import requests
 import datetime
+import os
 
 from core.tests import test_utils
-import feconf
 import python_utils
 
-from scripts import build
-from scripts import common
 from scripts import flake_checker
-from scripts import install_third_party_libs
+
+import requests
 
 
 class CheckIfOnCITests(test_utils.GenericTestBase):
@@ -58,7 +47,7 @@ def mock_getenv(variable):
 
     def test_returns_false_when_off_ci(self):
 
-        def mock_getenv(variable):
+        def mock_getenv(unused_variable):
             return False
 
         getenv_swap = self.swap_with_checks(
@@ -72,12 +61,13 @@ def mock_getenv(variable):
         self.assertFalse(on_ci)
 
 
-class MockDatetime:
+class MockDatetime(python_utils.OBJECT):
 
     def __init__(self, date):
         self.date = date
 
     def utcnow(self):
+        """Get datetime.datetime object."""
         return self.date
 
 
@@ -97,7 +87,7 @@ def mock_getenv(variable):
             }
             return environment_vars.get(variable)
 
-        def mock_post(url, json, allow_redirects, headers):  # pylint: disable=unused-args
+        def mock_post(url, json, allow_redirects, headers):  # pylint: disable=unused-argument
             pass
 
         expected_payload = {
@@ -136,7 +126,7 @@ def mock_getenv(variable):
             }
             return environment_vars.get(variable)
 
-        def mock_post(url, json, allow_redirects, headers):  # pylint: disable=unused-args
+        def mock_post(url, json, allow_redirects, headers):  # pylint: disable=unused-argument
             pass
 
         expected_payload = {
@@ -175,7 +165,7 @@ def mock_getenv(variable):
             }
             return environment_vars.get(variable)
 
-        def mock_post(url, json, allow_redirects, headers):  # pylint: disable=unused-args
+        def mock_post(url, json, allow_redirects, headers):  # pylint: disable=unused-argument
             raise requests.HTTPError()
 
         expected_payload = {
@@ -210,32 +200,36 @@ def mock_getenv(variable):
             environment_vars = dict()
             return environment_vars.get(variable)
 
-        def mock_post(url, json, allow_redirects, headers):  # pylint: disable=unused-args
+        def mock_post(url, json, allow_redirects, headers):  # pylint: disable=unused-argument
             raise AssertionError('requests.post called.')
 
         getenv_swap = self.swap(os, 'getenv', mock_getenv)
         post_swap = self.swap(requests, 'post', mock_post)
 
         with getenv_swap, post_swap:
             with self.assertRaisesRegexp(
-                    Exception, 'Unknown build environment.'):
+                Exception, 'Unknown build environment.'):
                 flake_checker.report_pass('suiteName')
 
 
-class MockResponse:
+class MockResponse(python_utils.OBJECT):
 
     def __init__(
-            self, ok=True, json=dict(), status_code=200, reason='foo'):
+            self, ok=True, json=None, status_code=200, reason='foo'):
+        if json is None:
+            json = dict()
         self.ok = ok
         self.json_dict = json
         self.status_code = status_code
         self.reason = reason
 
     def json(self):
+        """Get json dict or raise ValueError if json_dict not a dict."""
         if not isinstance(self.json_dict, dict):
             raise ValueError('Payload not JSON.')
         return self.json_dict
 
+
 class IsTestOutputFlakyTests(test_utils.GenericTestBase):
 
     def setUp(self):
@@ -252,7 +246,7 @@ def mock_getenv(variable):
             }
             return environment_vars.get(variable)
 
-        def mock_post(url, json, allow_redirects, headers):  # pylint: disable=unused-args
+        def mock_post(url, json, allow_redirects, headers):  # pylint: disable=unused-argument
             response = {
                 'log': ['log1', 'log2'],
                 'result': True,
@@ -303,7 +297,7 @@ def mock_getenv(variable):
             }
             return environment_vars.get(variable)
 
-        def mock_post(url, json, allow_redirects, headers):  # pylint: disable=unused-args
+        def mock_post(url, json, allow_redirects, headers):  # pylint: disable=unused-argument
             response = {
                 'log': ['log1', 'log2'],
                 'result': True,
@@ -354,7 +348,7 @@ def mock_getenv(variable):
             }
             return environment_vars.get(variable)
 
-        def mock_post(url, json, allow_redirects, headers):  # pylint: disable=unused-args
+        def mock_post(url, json, allow_redirects, headers):  # pylint: disable=unused-argument
             raise requests.HTTPError()
 
         expected_payload = {
@@ -396,7 +390,7 @@ def mock_getenv(variable):
             }
             return environment_vars.get(variable)
 
-        def mock_post(url, json, allow_redirects, headers):  # pylint: disable=unused-args
+        def mock_post(url, json, allow_redirects, headers):  # pylint: disable=unused-argument
             return MockResponse(False, None)
 
         expected_payload = {
@@ -438,7 +432,7 @@ def mock_getenv(variable):
             }
             return environment_vars.get(variable)
 
-        def mock_post(url, json, allow_redirects, headers):  # pylint: disable=unused-args
+        def mock_post(url, json, allow_redirects, headers):  # pylint: disable=unused-argument
             return MockResponse(True, None)
 
         expected_payload = {

@@ -1009,7 +1009,7 @@ def mock_get_chrome_driver_version():
                 ],),
             ],
         )
-        args = run_e2e_tests._PARSER.parse_args([])
+        args = run_e2e_tests._PARSER.parse_args(args=[])  # pylint: disable=protected-access
         with check_swap, setup_and_install_swap, register_swap, cleanup_swap:
             with build_swap, start_webdriver_swap:
                 with start_google_app_engine_server_swap:
@@ -1251,7 +1251,7 @@ def mock_start_portserver():
         with register_swap, run_swap, is_test_output_flaky_swap:
             with start_portserver_swap, cleanup_portserver_swap:
                 with on_ci_swap, cleanup_swap, exit_swap:
-                        run_e2e_tests.main(args=['--suite', 'mySuite'])
+                    run_e2e_tests.main(args=['--suite', 'mySuite'])
 
     def test_start_tests_skip_build(self):