Commit05d0d18

Alex Schworer

committed

Addlive_stream kwarg to Job.create

1 parenta6479eb commit05d0d18Copy full SHA for 05d0d18

File tree

+26

-1

lines changed

+26

-1

lines changed

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,12 @@`
	`1`	`+{`
	`2`	`+"stream_url":"rtmp://foo:1935/live",`
	`3`	`+"stream_name":"bar",`
	`4`	`+"outputs": [`
	`5`	`+ {`
	`6`	`+"label":null,`
	`7`	`+"url":"https://zencoder-temp-storage-us-east-1.s3.amazonaws.com",`
	`8`	`+"id":97931084`
	`9`	`+ }`
	`10`	`+ ],`
	`11`	`+"id":47010105`
	`12`	`+}`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,16 @@ def test_job_create(self, post):`
`19`	`19`	`self.assertTrue(resp.body['id']>0)`
`20`	`20`	`self.assertEquals(len(resp.body['outputs']),1)`
`21`	`21`
	`22`	`+@patch("requests.Session.post")`
	`23`	`+deftest_job_create_list(self,post):`
	`24`	`+post.return_value=load_response(201,'fixtures/job_create_live.json')`
	`25`	`+`
	`26`	`+resp=self.zen.job.create(live_stream=True)`
	`27`	`+`
	`28`	`+self.assertEquals(resp.code,201)`
	`29`	`+self.assertTrue(resp.body['id']>0)`
	`30`	`+self.assertEquals(len(resp.body['outputs']),1)`
	`31`	`+`
`22`	`32`	`@patch("requests.Session.get")`
`23`	`33`	`deftest_job_details(self,get):`
`24`	`34`	`get.return_value=load_response(200,'fixtures/job_details.json')`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ def create(self, input=None, live_stream=False, outputs=None, options=None):`
`242`	`242`	`Creates a transcoding job.`
`243`	`243`
`244`	`244`	`@param input: the input url as string`
`245`		`- @param live_stream: startsan RTMPLive Stream`
	`245`	`+ @param live_stream: startsaLive Stream job (input must be None)`
`246`	`246`	`@param outputs: a list of output dictionaries`
`247`	`247`	`@param options: a dictionary of job options`
`248`	`248`	`"""`
`@@ -253,6 +253,9 @@ def create(self, input=None, live_stream=False, outputs=None, options=None):`
`253`	`253`	`ifoptions:`
`254`	`254`	`data.update(options)`
`255`	`255`
	`256`	`+iflive_stream:`
	`257`	`+data['live_stream']=live_stream`
	`258`	`+`
`256`	`259`	`returnself.post(self.base_url,body=json.dumps(data))`
`257`	`260`
`258`	`261`	`deflist(self,page=1,per_page=50):`

Comments

(0)