Skip to content

[Release v5.4.4] #251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
opalczynski merged 20 commits into from
Sep 27, 2016
Merged

[Release v5.4.4] #251

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
004d21c
Merge pull request #246 from Syncano/release-v5.4.3
opalczynski Sep 23, 2016
ebf8e63
[HOTFIX] handling serialization/desrialization of the files properly;
opalczynski Sep 26, 2016
697932b
[HOT-FIX] files hot fix: create tests;
opalczynski Sep 27, 2016
c304f4b
[HOT-FIX] files hot fix: create tests;
opalczynski Sep 27, 2016
4d0188e
[HOT-FIX] files hot fix: create tests;
opalczynski Sep 27, 2016
f23984c
[HOT-FIX] files hot fix: create tests;
opalczynski Sep 27, 2016
d625383
[HOT-FIX] correct tests;
opalczynski Sep 27, 2016
98b7a1d
[HOT-FIX] correct tests;
opalczynski Sep 27, 2016
6115f25
[HOT-FIX] correct isort;
opalczynski Sep 27, 2016
20d6d79
[HOT-FIX] correct isort;
opalczynski Sep 27, 2016
473eb46
[HOT-FIX] correct isort;
opalczynski Sep 27, 2016
5d8271d
[HOT-FIX] correct isort;
opalczynski Sep 27, 2016
cfca799
[HOT-FIX] correct get_md5 method;
opalczynski Sep 27, 2016
e4dd765
[HOT-FIX] correct content get;
opalczynski Sep 27, 2016
95ebb90
[HOT FIX] correct open mode in class setup;
opalczynski Sep 27, 2016
5c69f72
[HOT-FIX] correct method which get files from s3 - if byte type in py…
opalczynski Sep 27, 2016
f564a04
[HOT-FIX] use cStringIO instead of StringIO;
opalczynski Sep 27, 2016
fab97e1
[HOT-FIX] back to StringIO;
opalczynski Sep 27, 2016
1b58706
Merge pull request #249 from Syncano/files-hot-fix
opalczynski Sep 27, 2016
70313a3
[RELEASE v5.4.4] bump the version;
opalczynski Sep 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[HOT-FIX] correct method which get files from s3 - if byte type in py… 
…3 - decode to utf-8;
  • Loading branch information
@opalczynski
opalczynski committed Sep 27, 2016
commit 5c69f72e02424dbd5f5fb7152f414acf37cf7397
21 changes: 15 additions & 6 deletions tests/integration_test_data_objects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def test_updating_file_field(self):
file_url = data_object.test_field_file

update_string = 'updating also field a'
file_content = 'some example text file;'
file_content = 'some example text file'
new_file = StringIO(file_content)
data_object.test_field_file = new_file
data_object.test_field_a = update_string
Expand All @@ -67,7 +67,7 @@ def test_updating_file_field(self):
self.assertNotEqual(data_object.test_field_file, file_url)

# check file content;
file_content_s3 = requests.get(data_object.test_field_file).content
file_content_s3 = self.get_s3_file(data_object.test_field_file)
self.assertEqual(file_content_s3, file_content)

def test_manager_update(self):
Expand Down Expand Up @@ -101,7 +101,9 @@ def test_manager_update(self):
self.assertEqual(data_object.test_field_a, new_update_string)
# should change;
self.assertNotEqual(data_object.test_field_file, file_url)
file_content_s3 = requests.get(data_object.test_field_file).content

# check file content;
file_content_s3 = self.get_s3_file(data_object.test_field_file)
self.assertEqual(file_content_s3, file_content)

def test_manager_create(self):
Expand All @@ -117,16 +119,23 @@ def test_manager_create(self):
self.assert_file_md5(data_object)

@classmethod
def get_file_md5(cls, file_object):
if not isinstance(file_object, six.string_types):
file_content = file_object.read()
def get_file_md5(cls, file_content):
if not isinstance(file_content, (six.string_types, six.binary_type)):
file_content = file_content.read()
return md5(file_content).hexdigest()

def assert_file_md5(self, data_object):
file_content = requests.get(data_object.test_field_file).content
file_md5 = self.get_file_md5(file_content)
self.assertEqual(self.file_md5, file_md5)

@classmethod
def get_s3_file(cls, url):
file_content_s3 = requests.get(url).content
if hasattr(file_content_s3, 'decode'):
file_content_s3 = file_content_s3.decode('utf-8')
return file_content_s3

def _create_object_with_file(self):
with open('tests/test_files/python-logo.png', 'rb') as f:
object = Object.please.create(
Expand Down