Revert "Add unit tests for mixin exceptions"

Gauvain Pocentek · Gauvain Pocentek · commit 084b905f7804 · 2017-11-16T06:53:49.000+01:00
This reverts commit 4ee139a.
diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst
@@ -16,7 +16,6 @@ Changes from 1.1 to 1.2
     ``set_token`` and ``set_credentials`` methods. Once a Gitlab object has been
     created its URL and authentication information cannot be updated: create a
     new Gitlab object if you need to use new information
-* The ``todo()`` method raises a ``GitlabTodoError`` exception on error
 
 Changes from 1.0.2 to 1.1
 =========================
diff --git a/gitlab/mixins.py b/gitlab/mixins.py
@@ -113,12 +113,7 @@ def get(self, id, **kwargs):
             GitlabAuthenticationError: If authentication is not correct
             GitlabGetError: If the server cannot perform the request
         """
-        try:
-            gen = self.list()
-        except exc.GitlabListError:
-            raise exc.GitlabGetError(response_code=404,
-                                     error_message="Not found")
-
+        gen = self.list()
         for obj in gen:
             if str(obj.get_id()) == str(id):
                 return obj
@@ -387,7 +382,7 @@ def unsubscribe(self, **kwargs):
 
 class TodoMixin(object):
     @cli.register_custom_action(('ProjectIssue', 'ProjectMergeRequest'))
-    @exc.on_http_error(exc.GitlabTodoError)
+    @exc.on_http_error(exc.GitlabHttpError)
     def todo(self, **kwargs):
         """Create a todo associated to the object.
 
diff --git a/gitlab/tests/test_mixins.py b/gitlab/tests/test_mixins.py
@@ -434,89 +434,3 @@ def resp_cont(url, request):
             self.assertIsInstance(obj, FakeObject)
             self.assertEqual(obj.key, 'foo')
             self.assertEqual(obj.value, 'bar')
-
-
-class TestExceptions(unittest.TestCase):
-    def setUp(self):
-        self.gl = Gitlab("http://localhost", private_token="private_token",
-                         api_version=4)
-
-    def test_get_mixin(self):
-        class M(GetMixin, FakeManager):
-            pass
-
-        m = M(self.gl)
-        self.assertRaises(GitlabGetError, m.get, 1)
-
-    def test_get_without_id_mixin(self):
-        class M(GetWithoutIdMixin, FakeManager):
-            pass
-
-        m = M(self.gl)
-        self.assertRaises(GitlabGetError, m.get)
-
-    def test_list_mixin(self):
-        class M(ListMixin, FakeManager):
-            pass
-
-        m = M(self.gl)
-        self.assertRaises(GitlabListError, m.list)
-
-    def test_get_from_list_mixin(self):
-        class M(GetFromListMixin, FakeManager):
-            pass
-
-        m = M(self.gl)
-        self.assertRaises(GitlabListError, m.list)
-        self.assertRaises(GitlabGetError, m.get, 1)
-
-    def test_create_mixin(self):
-        class M(CreateMixin, FakeManager):
-            pass
-
-        m = M(self.gl)
-        self.assertRaises(GitlabCreateError, m.create, {})
-
-    def test_update_mixin(self):
-        class M(UpdateMixin, FakeManager):
-            pass
-
-        m = M(self.gl)
-        self.assertRaises(GitlabUpdateError, m.update, 1, {})
-
-    def test_set_mixin(self):
-        class M(SetMixin, FakeManager):
-            pass
-
-        m = M(self.gl)
-        self.assertRaises(GitlabSetError, m.set, 'foo', 'bar')
-
-    def test_delete_mixin(self):
-        class M(DeleteMixin, FakeManager):
-            pass
-
-        m = M(self.gl)
-        self.assertRaises(GitlabDeleteError, m.delete, 1)
-
-    def test_object_mixin(self):
-        class M(UpdateMixin, DeleteMixin, FakeManager):
-            pass
-
-        class O(SaveMixin, ObjectDeleteMixin, AccessRequestMixin,
-                SubscribableMixin, TodoMixin, TimeTrackingMixin, RESTObject):
-            pass
-
-        mgr = M(self.gl)
-        obj = O(mgr, {'id': 42, 'foo': 'bar'})
-        obj.foo = 'baz'
-        self.assertRaises(GitlabUpdateError, obj.save)
-        self.assertRaises(GitlabDeleteError, obj.delete)
-        self.assertRaises(GitlabUpdateError, obj.approve)
-        self.assertRaises(GitlabSubscribeError, obj.subscribe)
-        self.assertRaises(GitlabUnsubscribeError, obj.unsubscribe)
-        self.assertRaises(GitlabTodoError, obj.todo)
-        self.assertRaises(GitlabTimeTrackingError, obj.time_stats)
-        self.assertRaises(GitlabTimeTrackingError, obj.time_estimate, '1d')
-        self.assertRaises(GitlabTimeTrackingError, obj.reset_time_estimate)
-        self.assertRaises(GitlabTimeTrackingError, obj.add_spent_time, '1d')
-        self.assertRaises(GitlabTimeTrackingError, obj.reset_spent_time)
