Stone_Red/dvc
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/dvc.git synced 2026-11-09 23:10:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

test_config: python3 fix

Browse Source 
1) use io for StringIO in python3
2) use builtins instead of __builtin__
3) use StringIO instead of BytesIO when mocking aws config
Othervise this test fails on python3.

Signed-off-by: Ruslan Kuprieiev <[email protected]>
This commit is contained in:
Ruslan Kuprieiev
2017-06-12 00:22:19 +03:00
parent 52d4c001a9
commit 4078e902d1
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_config.py
+22 -9
View File
@@ -1,11 +1,22 @@
import io
import os
import shutil
import StringIO
import traceback
from unittest import TestCase
import mock
try:
from StringIO import StringIO
except ImportError:
# Python 3
from io import StringIO
try:
import __builtin__
builtin_module_name = '__builtin__'
except ImportError:
# Python 3
builtin_module_name = 'builtins'
from dvc.path.path import Path
from dvc.system import System
@@ -33,7 +44,7 @@ class TestConfigTest(TestCase):
"[GCP]",
"StoragePath = googlesb/google_storage_path"
)
s = StringIO.StringIO('\n'.join(c))
s = StringIO('\n'.join(c))
conf = Config(s, conf_pseudo_file = s)
cloud = DataCloud(Settings(None, None, conf))
self.assertEqual(cloud.typ, 'AWS')
@@ -52,7 +63,7 @@ class TestConfigTest(TestCase):
"[GCP]",
"StoragePath = googlesb/google_storage_path"
)
s = StringIO.StringIO('\n'.join(c))
s = StringIO('\n'.join(c))
conf = Config(s, conf_pseudo_file=s)
cloud = DataCloud(Settings(None, None, conf))
self.assertEqual(cloud.typ, 'AWS')
@@ -66,13 +77,13 @@ class TestConfigTest(TestCase):
creds0 = ("[default]",
"aws_access_key_id = default_access_id",
"aws_secret_access_key = default_sekret")
return io.BytesIO('\n'.join(creds0))
return StringIO('\n'.join(creds0))
creds1 = ("[default]",
"aws_access_key_id = override_access_id",
"aws_secret_access_key = override_sekret")
return io.BytesIO('\n'.join(creds1))
return StringIO('\n'.join(creds1))
def aws_credentials_default_test(self):
""" in absence of [AWS] -> CredentialPath, aws creds should be read from ~/.aws/credentials """
@@ -88,9 +99,10 @@ class TestConfigTest(TestCase):
"StoragePath = awssb/aws_storage_path",
"CredentialPath =",
)
s = StringIO.StringIO('\n'.join(c))
s = StringIO('\n'.join(c))
patcher = mock.patch(builtin_module_name + '.open', side_effect=self.mocked_open_aws_default_credentials)
patcher = mock.patch('__builtin__.open', side_effect=self.mocked_open_aws_default_credentials)
patcher.start()
conf = Config(s, conf_pseudo_file=s)
cloud = DataCloud(Settings(None, None, conf))
@@ -119,9 +131,10 @@ class TestConfigTest(TestCase):
"StoragePath = awssb/aws_storage_path",
"CredentialPath = some_credential_path",
)
s = StringIO.StringIO('\n'.join(c))
s = StringIO('\n'.join(c))
patcher = mock.patch(builtin_module_name + '.open', side_effect=self.mocked_open_aws_default_credentials)
patcher = mock.patch('__builtin__.open', side_effect=self.mocked_open_aws_default_credentials)
patcher.start()
conf = Config(s, conf_pseudo_file=s)
cloud = DataCloud(Settings(None, None, conf))