Commitdc5517c

committed

Merge pull requestsigmavirus24#611 from bluekeyes/refresh-json

Update JSON data in refresh()

2 parentsf6948ac +6290a69 commitdc5517cCopy full SHA for dc5517c

File tree

+20

-1

lines changed

+20

-1

lines changed

Lines changed: 3 additions & 1 deletion

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -285,6 +285,7 @@ def refresh(self, conditional=False):`
`285`	`285`	`headers=headersorNone`
`286`	`286`	`json=self._json(self._get(self._api,headers=headers),200)`
`287`	`287`	`ifjsonisnotNone:`
	`288`	`+self._json_data=json`
`288`	`289`	`self._update_attributes(json)`
`289`	`290`	`returnself`
`290`	`291`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`importio`
	`2`	`+importjson`
`2`	`3`	`importpytest`
`3`	`4`	`importrequests`
`4`	`5`
`@@ -184,6 +185,21 @@ def test_refresh_etag(self):`
`184`	`185`	`headers=expected_headers,`
`185`	`186`	`)`
`186`	`187`
	`188`	`+deftest_refresh_json(self):`
	`189`	`+"""Verify refreshing an object updates stored json data."""`
	`190`	`+expected_data= {`
	`191`	`+'changed_files':4`
	`192`	`+ }`
	`193`	`+response=requests.Response()`
	`194`	`+response.status_code=200`
	`195`	`+response.raw=io.BytesIO(json.dumps(expected_data).encode('utf8'))`
	`196`	`+self.session.get.return_value=response`
	`197`	`+`
	`198`	`+self.instance.refresh()`
	`199`	`+`
	`200`	`+assert'changed_files'inself.instance.as_dict()`
	`201`	`+assertself.instance.changed_files==4`
	`202`	`+`
`187`	`203`	`deftest_strptime(self):`
`188`	`204`	`"""Verify that method converts ISO 8601 formatted string."""`
`189`	`205`	`dt=self.instance._strptime('2015-06-18T19:53:04Z')`

Comments

(0)