NotificationsYou must be signed in to change notification settings
Fork673
Star2.4k

Commit084b905

Gauvain Pocentek

committed

Revert "Add unit tests for mixin exceptions"

This reverts commit4ee139a.

1 parent9ede652 commit084b905Copy full SHA for 084b905

File tree

3 files changed

-94

lines changed

RELEASE_NOTES.rst
gitlab
- mixins.py
- tests
  - test_mixins.py

3 files changed

-94

lines changed

`‎RELEASE_NOTES.rst`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ Changes from 1.1 to 1.2`
`16`	`16`	``set_token`` and ``set_credentials`` methods. Once a Gitlab object has been
`17`	`17`	`created its URL and authentication information cannot be updated: create a`
`18`	`18`	`new Gitlab object if you need to use new information`
`19`		-* The ``todo()`` method raises a ``GitlabTodoError`` exception on error
`20`	`19`
`21`	`20`	`Changes from 1.0.2 to 1.1`
`22`	`21`	`=========================`

`‎gitlab/mixins.py`

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -113,12 +113,7 @@ def get(self, id, **kwargs):`
`113`	`113`	`GitlabAuthenticationError: If authentication is not correct`
`114`	`114`	`GitlabGetError: If the server cannot perform the request`
`115`	`115`	`"""`
`116`		`-try:`
`117`		`-gen=self.list()`
`118`		`-exceptexc.GitlabListError:`
`119`		`-raiseexc.GitlabGetError(response_code=404,`
`120`		`-error_message="Not found")`
`121`		`-`
	`116`	`+gen=self.list()`
`122`	`117`	`forobjingen:`
`123`	`118`	`ifstr(obj.get_id())==str(id):`
`124`	`119`	`returnobj`
`@@ -387,7 +382,7 @@ def unsubscribe(self, **kwargs):`
`387`	`382`
`388`	`383`	`classTodoMixin(object):`
`389`	`384`	`@cli.register_custom_action(('ProjectIssue','ProjectMergeRequest'))`
`390`		`-@exc.on_http_error(exc.GitlabTodoError)`
	`385`	`+@exc.on_http_error(exc.GitlabHttpError)`
`391`	`386`	`deftodo(self,**kwargs):`
`392`	`387`	`"""Create a todo associated to the object.`
`393`	`388`

`‎gitlab/tests/test_mixins.py`

Lines changed: 0 additions & 86 deletions

Original file line number	Diff line number	Diff line change
`@@ -434,89 +434,3 @@ def resp_cont(url, request):`
`434`	`434`	`self.assertIsInstance(obj,FakeObject)`
`435`	`435`	`self.assertEqual(obj.key,'foo')`
`436`	`436`	`self.assertEqual(obj.value,'bar')`
`437`		`-`
`438`		`-`
`439`		`-classTestExceptions(unittest.TestCase):`
`440`		`-defsetUp(self):`
`441`		`-self.gl=Gitlab("http://localhost",private_token="private_token",`
`442`		`-api_version=4)`
`443`		`-`
`444`		`-deftest_get_mixin(self):`
`445`		`-classM(GetMixin,FakeManager):`
`446`		`-pass`
`447`		`-`
`448`		`-m=M(self.gl)`
`449`		`-self.assertRaises(GitlabGetError,m.get,1)`
`450`		`-`
`451`		`-deftest_get_without_id_mixin(self):`
`452`		`-classM(GetWithoutIdMixin,FakeManager):`
`453`		`-pass`
`454`		`-`
`455`		`-m=M(self.gl)`
`456`		`-self.assertRaises(GitlabGetError,m.get)`
`457`		`-`
`458`		`-deftest_list_mixin(self):`
`459`		`-classM(ListMixin,FakeManager):`
`460`		`-pass`
`461`		`-`
`462`		`-m=M(self.gl)`
`463`		`-self.assertRaises(GitlabListError,m.list)`
`464`		`-`
`465`		`-deftest_get_from_list_mixin(self):`
`466`		`-classM(GetFromListMixin,FakeManager):`
`467`		`-pass`
`468`		`-`
`469`		`-m=M(self.gl)`
`470`		`-self.assertRaises(GitlabListError,m.list)`
`471`		`-self.assertRaises(GitlabGetError,m.get,1)`
`472`		`-`
`473`		`-deftest_create_mixin(self):`
`474`		`-classM(CreateMixin,FakeManager):`
`475`		`-pass`
`476`		`-`
`477`		`-m=M(self.gl)`
`478`		`-self.assertRaises(GitlabCreateError,m.create, {})`
`479`		`-`
`480`		`-deftest_update_mixin(self):`
`481`		`-classM(UpdateMixin,FakeManager):`
`482`		`-pass`
`483`		`-`
`484`		`-m=M(self.gl)`
`485`		`-self.assertRaises(GitlabUpdateError,m.update,1, {})`
`486`		`-`
`487`		`-deftest_set_mixin(self):`
`488`		`-classM(SetMixin,FakeManager):`
`489`		`-pass`
`490`		`-`
`491`		`-m=M(self.gl)`
`492`		`-self.assertRaises(GitlabSetError,m.set,'foo','bar')`
`493`		`-`
`494`		`-deftest_delete_mixin(self):`
`495`		`-classM(DeleteMixin,FakeManager):`
`496`		`-pass`
`497`		`-`
`498`		`-m=M(self.gl)`
`499`		`-self.assertRaises(GitlabDeleteError,m.delete,1)`
`500`		`-`
`501`		`-deftest_object_mixin(self):`
`502`		`-classM(UpdateMixin,DeleteMixin,FakeManager):`
`503`		`-pass`
`504`		`-`
`505`		`-classO(SaveMixin,ObjectDeleteMixin,AccessRequestMixin,`
`506`		`-SubscribableMixin,TodoMixin,TimeTrackingMixin,RESTObject):`
`507`		`-pass`
`508`		`-`
`509`		`-mgr=M(self.gl)`
`510`		`-obj=O(mgr, {'id':42,'foo':'bar'})`
`511`		`-obj.foo='baz'`
`512`		`-self.assertRaises(GitlabUpdateError,obj.save)`
`513`		`-self.assertRaises(GitlabDeleteError,obj.delete)`
`514`		`-self.assertRaises(GitlabUpdateError,obj.approve)`
`515`		`-self.assertRaises(GitlabSubscribeError,obj.subscribe)`
`516`		`-self.assertRaises(GitlabUnsubscribeError,obj.unsubscribe)`
`517`		`-self.assertRaises(GitlabTodoError,obj.todo)`
`518`		`-self.assertRaises(GitlabTimeTrackingError,obj.time_stats)`
`519`		`-self.assertRaises(GitlabTimeTrackingError,obj.time_estimate,'1d')`
`520`		`-self.assertRaises(GitlabTimeTrackingError,obj.reset_time_estimate)`
`521`		`-self.assertRaises(GitlabTimeTrackingError,obj.add_spent_time,'1d')`
`522`		`-self.assertRaises(GitlabTimeTrackingError,obj.reset_spent_time)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit084b905

File tree

3 files changed

3 files changed

`‎RELEASE_NOTES.rst`

`‎gitlab/mixins.py`

`‎gitlab/tests/test_mixins.py`

0 commit comments