Commitfc8affd

Gauvain Pocentek

committed

Fix Project.tree()

Add API tests for tree(), blob() and archive().

1 parent141f21a commitfc8affdCopy full SHA for fc8affd

File tree

+18

-3

lines changed

+18

-3

lines changed

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1207,14 +1207,20 @@ def Tag(self, id=None, **kwargs):`
`1207`	`1207`	`**kwargs)`
`1208`	`1208`
`1209`	`1209`	`deftree(self,path='',ref_name='',**kwargs):`
`1210`		`-url="%s/%s/repository/tree"% (self._url,self.id)`
`1211`		`-url+='?path=%s&ref_name=%s'% (path,ref_name)`
	`1210`	`+url="/projects/%s/repository/tree"% (self.id)`
	`1211`	`+params= []`
	`1212`	`+ifpath:`
	`1213`	`+params.append("path=%s"%path)`
	`1214`	`+ifref_name:`
	`1215`	`+params.append("ref_name=%s"%ref_name)`
	`1216`	`+ifparams:`
	`1217`	`+url+='?'+"&".join(params)`
`1212`	`1218`	`r=self.gitlab._raw_get(url,**kwargs)`
`1213`	`1219`	`raise_error_from_response(r,GitlabGetError)`
`1214`	`1220`	`returnr.json()`
`1215`	`1221`
`1216`	`1222`	`defblob(self,sha,filepath,**kwargs):`
`1217`		`-url="%s/%s/repository/blobs/%s"% (self._url,self.id,sha)`
	`1223`	`+url="/projects/%s/repository/blobs/%s"% (self.id,sha)`
`1218`	`1224`	`url+='?filepath=%s'% (filepath)`
`1219`	`1225`	`r=self.gitlab._raw_get(url,**kwargs)`
`1220`	`1226`	`raise_error_from_response(r,GitlabGetError)`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,15 @@`
`121`	`121`	`readme=admin_project.files.get(file_path='README.rst',ref='master')`
`122`	`122`	`assert(readme.decode()=='Initial content')`
`123`	`123`
	`124`	`+tree=admin_project.tree()`
	`125`	`+assert(len(tree)==1)`
	`126`	`+assert(tree[0]['name']=='README.rst')`
	`127`	`+blob=admin_project.blob('master','README.rst')`
	`128`	`+assert(blob=='Initial content')`
	`129`	`+archive1=admin_project.archive()`
	`130`	`+archive2=admin_project.archive('master')`
	`131`	`+assert(archive1==archive2)`
	`132`	`+`
`124`	`133`	`# labels`
`125`	`134`	`label1=admin_project.labels.create({'name':'label1','color':'#778899'})`
`126`	`135`	`label1=admin_project.labels.get('label1')`

Comments

(0)