Delint and fix broken tests

sqrrrl · sqrrrl · commit b5241085c2d3 · 2022-03-03T13:56:55.000-07:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -23,7 +23,7 @@ jobs:
           git fetch origin master "${{ github.event.pull_request.base.sha }}"
           git diff  --diff-filter=ACM --name-only "${{ github.event.pull_request.base.sha }}" "${{ github.sha }}" > "${HOME}/changed_files.txt"
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
diff --git a/classroom/snippets/classroom_create_course.py b/classroom/snippets/classroom_create_course.py
@@ -14,8 +14,8 @@
 limitations under the License.
 
 """
-# [START classroom_create_course]
 
+# [START classroom_create_course]
 from __future__ import print_function
 
 import google.auth
diff --git a/classroom/snippets/classroom_create_coursework.py b/classroom/snippets/classroom_create_coursework.py
@@ -14,14 +14,13 @@
 limitations under the License.
 
 """
+# [START classroom_create_coursework]
 from __future__ import print_function
 
 import google.auth
 from googleapiclient.discovery import build
 from googleapiclient.errors import HttpError
 
-# [START classroom_create_coursework]
-
 
 def classroom_create_coursework(course_id):
 
diff --git a/classroom/snippets/classroom_get_course.py b/classroom/snippets/classroom_get_course.py
@@ -16,7 +16,6 @@
 """
 
 # [START classroom_get_course]
-
 from __future__ import print_function
 
 import google.auth
diff --git a/classroom/snippets/classroom_list_courses.py b/classroom/snippets/classroom_list_courses.py
@@ -34,14 +34,13 @@ def classroom_list_courses():
     """
 
     creds, _ = google.auth.default()
-    # pylint: disable=maybe-no-member
-    course = None
     try:
         service = build('classroom', 'v1', credentials=creds)
         courses = []
         page_token = None
 
         while True:
+            # pylint: disable=maybe-no-member
             response = service.courses().list(pageToken=page_token,
                                               pageSize=100).execute()
             courses.extend(response.get('courses', []))
@@ -55,7 +54,7 @@ def classroom_list_courses():
         print("Courses:")
         for course in courses:
             print(f"{course.get('name'), course.get('id')}")
-        return course
+        return courses
     except HttpError as error:
         print(f"An error occurred: {error}")
         return error
diff --git a/classroom/snippets/classroom_list_student_submissions.py b/classroom/snippets/classroom_list_student_submissions.py
@@ -14,14 +14,13 @@
 limitations under the License.
 
 """
+# [START classroom_list_student_submissions]
 from __future__ import print_function
 
 import google.auth
 from googleapiclient.discovery import build
 from googleapiclient.errors import HttpError
 
-# [START classroom_list_student_submissions]
-
 
 def classroom_list_student_submissions(course_id, coursework_id, user_id):
     """
diff --git a/classroom/snippets/classroom_list_submissions.py b/classroom/snippets/classroom_list_submissions.py
@@ -14,14 +14,13 @@
 limitations under the License.
 
 """
+# [START classroom_list_submissions]
 from __future__ import print_function
 
 import google.auth
 from googleapiclient.discovery import build
 from googleapiclient.errors import HttpError
 
-# [START classroom_list_submissions]
-
 
 def classroom_list_submissions(course_id, coursework_id):
     """
diff --git a/classroom/snippets/classroom_patch_course.py b/classroom/snippets/classroom_patch_course.py
@@ -14,7 +14,6 @@
 """
 
 # [START classroom_patch_course]
-
 from __future__ import print_function
 
 import google.auth
@@ -44,7 +43,7 @@ def classroom_patch_course(course_id):
                                          updateMask='section,room',
                                          body=course).execute()
         print(f" Course updated are: {course.get('name')}")
-
+        return course
     except HttpError as error:
         print(f"An error occurred: {error}")
 
diff --git a/classroom/snippets/classroom_update_course.py b/classroom/snippets/classroom_update_course.py
@@ -15,7 +15,6 @@
 """
 
 # [START classroom_update_course]
-
 from __future__ import print_function
 
 import google.auth
@@ -44,6 +43,7 @@ def classroom_update_course(course_id):
         course['room'] = '410'
         course = service.courses().update(id=course_id, body=course).execute()
         print(f" Updated Course is:  {course.get('name')}")
+        return course
 
     except HttpError as error:
         print(f"An error occurred: {error}")
diff --git a/classroom/snippets/test_classroom_create_course.py b/classroom/snippets/test_classroom_create_course.py
@@ -14,16 +14,16 @@
 import unittest
 
 import classroom_create_course
+from base_test import BaseTest
 
 
-class TestClassroomCreateCourse(unittest.TestCase):
+class TestClassroomCreateCourse(BaseTest):
     """Unit test class for Create course snippet"""
-    @classmethod
-    def test_classroom_create_course(cls):
+    def test_classroom_create_course(self):
         """Class function for Create course snippet"""
         course = classroom_create_course.classroom_create_course()
-        cls.assertIsNotNone(cls, course)
-        cls.doClassCleanups()
+        self.assertIsNotNone(course)
+        self.delete_course_on_cleanup(course.get('id'))
 
 
 if __name__ == "__main__":
diff --git a/classroom/snippets/test_classroom_get_course.py b/classroom/snippets/test_classroom_get_course.py
@@ -14,19 +14,21 @@
 
 import unittest
 
+import classroom_create_course
 import classroom_get_course
-import classroom_list_courses
+from base_test import BaseTest
 
 
-class TestClassroomGetCourse(unittest.TestCase):
+class TestClassroomGetCourse(BaseTest):
     """Unit test class for Get course snippet"""
-    @classmethod
-    def test_classroom_get_course(cls):
+    def test_classroom_get_course(self):
         """Unit test method for Get course snippet"""
-        course = classroom_list_courses.classroom_list_courses()
+        course = classroom_create_course.classroom_create_course()
+        self.assertIsNotNone(course)
+        self.delete_course_on_cleanup(course.get('id'))
         course_id = classroom_get_course.classroom_get_course(course.get(
                     'id'))
-        cls.assertIsNotNone(cls, course_id)
+        self.assertIsNotNone(course_id)
 
 
 if __name__ == "__main__":
diff --git a/classroom/snippets/test_classroom_list_courses.py b/classroom/snippets/test_classroom_list_courses.py
@@ -12,16 +12,20 @@
 """
 import unittest
 
+import classroom_create_course
 import classroom_list_courses
+from base_test import BaseTest
 
 
-class TestClassroomListCourses(unittest.TestCase):
+class TestClassroomListCourses(BaseTest):
     """Unit test class for List course snippet"""
-    @classmethod
-    def test_classroom_create_course(cls):
+    def test_classroom_list_courses(self):
         """Unit test method for List course snippet"""
-        course = classroom_list_courses.classroom_list_courses()
-        cls.assertIsNotNone(cls, course)
+        course = classroom_create_course.classroom_create_course()
+        self.assertIsNotNone(course)
+        self.delete_course_on_cleanup(course.get('id'))
+        courses = classroom_list_courses.classroom_list_courses()
+        self.assertIsNotNone(courses)
 
 
 if __name__ == "__main__":
diff --git a/classroom/snippets/test_classroom_patch_course.py b/classroom/snippets/test_classroom_patch_course.py
@@ -12,19 +12,20 @@
 """
 import unittest
 
-import classroom_list_courses
+import classroom_create_course
 import classroom_patch_course
+from base_test import BaseTest
 
 
-class TestClassroomPatchCourse(unittest.TestCase):
+class TestClassroomPatchCourse(BaseTest):
     """Unit test class for Patch course snippet"""
-    @classmethod
-    def test_classroom_patch_course(cls):
+    def test_classroom_patch_course(self):
         """Unit test method for Patch course snippet"""
-        course = classroom_list_courses.classroom_list_courses()
-        course_id = classroom_patch_course.classroom_patch_course(course
-                                                                  .get('id'))
-        cls.assertIsNotNone(cls, course_id)
+        course = classroom_create_course.classroom_create_course()
+        self.assertIsNotNone(course)
+        self.delete_course_on_cleanup(course.get('id'))
+        course = classroom_patch_course.classroom_patch_course(course.get('id'))
+        self.assertIsNotNone(course)
 
 
 if __name__ == '__main__':
diff --git a/classroom/snippets/test_classroom_update_course.py b/classroom/snippets/test_classroom_update_course.py
@@ -12,19 +12,20 @@
 """
 import unittest
 
-import classroom_list_courses
+import classroom_create_course
 import classroom_update_course
+from base_test import BaseTest
 
 
-class TestClassroomUpdateCourse(unittest.TestCase):
+class TestClassroomUpdateCourse(BaseTest):
     """Unit test class for Get course snippet"""
-    @classmethod
-    def test_classroom_update_course(cls):
+    def test_classroom_update_course(self):
         """Unit test method for Get course snippet"""
-        course = classroom_list_courses.classroom_list_courses()
-        course_id = classroom_update_course.classroom_update_course(course
-                                                                    .get('id'))
-        cls.assertIsNotNone(cls, course_id)
+        course = classroom_create_course.classroom_create_course()
+        self.assertIsNotNone(course)
+        self.delete_course_on_cleanup(course.get('id'))
+        course = classroom_update_course.classroom_update_course(course.get('id'))
+        self.assertIsNotNone(course)
 
 
 if __name__ == "__main__":
diff --git a/classroom/snippets/test_snippets.py b/classroom/snippets/test_snippets.py
diff --git a/slides/snippets/slides_snippets.py b/slides/snippets/slides_snippets.py
@@ -137,8 +137,7 @@ def create_image(self, presentation_id, page_id):
         # [START slides_create_image]
         # Create a new image, using the supplied object ID,
         # with content downloaded from IMAGE_URL.
-        IMAGE_URL = ('https://www.google.com/images/branding/'
-                     'googlelogo/2x/googlelogo_color_272x92dp.png')
+        IMAGE_URL = 'https://picsum.photos/200'
         requests = []
         image_id = 'MyImage_01'
         emu4M = {
diff --git a/slides/snippets/test_snippets.py b/slides/snippets/test_snippets.py
@@ -20,8 +20,7 @@
 
 
 class SnippetsTest(BaseTest):
-    IMAGE_URL = 'https://www.google.com/images/' \
-        'branding/googlelogo/2x/googlelogo_color_272x92dp.png'
+    IMAGE_URL = 'https://picsum.photos/200'
     TEMPLATE_PRESENTATION_ID = '1ElmXUX6de-b_OkH2iOK8PKS9FfQeln_Rx0aloIg6Rdc'
     DATA_SPREADSHEET_ID = '17eqFZl_WK4WVixX8PjvjfLD77DraoFwMDXeiHB3dvuM'
     CHART_ID = 1107320627
