Skip to content

Commit

Permalink
Reducing line width to 79, #105
Browse files Browse the repository at this point in the history
  • Loading branch information
pylover committed Aug 2, 2018
1 parent d7f5b5e commit 07dd8b8
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 13 deletions.
15 changes: 11 additions & 4 deletions sqlalchemy_media/tests/helpers/http.py
Expand Up @@ -11,21 +11,28 @@


@contextlib.contextmanager
def simple_http_server(handler_class, server_class=HTTPServer, app=None, bind=('', 0)):
def simple_http_server(handler_class, server_class=HTTPServer, app=None,
bind=('', 0)):
server = server_class(bind, handler_class)
if app:
assert issubclass(server_class, WSGIServer)
server.set_app(app)
thread = threading.Thread(target=server.serve_forever, name='sa-media test server.',
daemon=True)
thread = threading.Thread(
target=server.serve_forever,
name='sa-media test server.',
daemon=True
)
thread.start()
yield server
server.shutdown()
thread.join()


def encode_multipart_data(fields: dict = None, files: dict = None): # pragma: no cover
boundary = ''.join(['-----', base64.urlsafe_b64encode(urandom(27)).decode()])
boundary = ''.join([
'-----',
base64.urlsafe_b64encode(urandom(27)).decode()
])
crlf = b'\r\n'
lines = []

Expand Down
6 changes: 5 additions & 1 deletion sqlalchemy_media/tests/helpers/os2.py
Expand Up @@ -91,6 +91,10 @@ def do_DELETE(self):

# Ensure bucket
makedirs(join(temp_path, bucket), exist_ok=True)
with simple_http_server(OS2Handler, server_class=WSGIServer, **kwargs) as server:
with simple_http_server(
OS2Handler,
server_class=WSGIServer,
**kwargs
) as server:
url = 'http://localhost:%s' % server.server_address[1]
yield server, url
8 changes: 6 additions & 2 deletions sqlalchemy_media/tests/helpers/s3.py
Expand Up @@ -11,8 +11,12 @@ def mockup_s3_server(bucket, **kwargs):
from moto.server import DomainDispatcherApplication, create_backend_app
mock_app = DomainDispatcherApplication(create_backend_app, 's3')
mock_app.debug = False
with simple_http_server(WSGIRequestHandler,
server_class=WSGIServer, app=mock_app, **kwargs) as server:
with simple_http_server(
WSGIRequestHandler,
server_class=WSGIServer,
app=mock_app,
**kwargs
) as server:
url = 'http://localhost:%s' % server.server_address[1]
# Create the bucket
bucket_uri = '%s/%s' % (url, bucket)
Expand Down
3 changes: 2 additions & 1 deletion sqlalchemy_media/tests/helpers/ssh.py
Expand Up @@ -33,7 +33,8 @@ def client(self, uid):
class MockupSSHTestCase(SqlAlchemyTestCase):
def setUp(self):
self.here = abspath(join(dirname(__file__), '..'))
self.relative_temp_path = join('temp', self.__class__.__name__, self._testMethodName)
self.relative_temp_path = \
join('temp', self.__class__.__name__, self._testMethodName)
self.temp_path = join(self.here, self.relative_temp_path)
# Remove previous files, if any! to make a clean temp directory:
if exists(self.temp_path): # pragma: no cover
Expand Down
5 changes: 4 additions & 1 deletion sqlalchemy_media/tests/helpers/static.py
Expand Up @@ -25,7 +25,10 @@ def serve_static_file(self, filename: AnyStr):

def serve_stream(self, stream: FileLike):
buffer = io.BytesIO()
self.send_header('Content-Length', str(copy_stream(stream, buffer)))
self.send_header(
'Content-Length',
str(copy_stream(stream, buffer))
)
self.end_headers()
buffer.seek(0)
try:
Expand Down
16 changes: 12 additions & 4 deletions sqlalchemy_media/tests/helpers/testcases.py
Expand Up @@ -49,8 +49,11 @@ def setUpClass(cls):
def setUp(self):
self.temp_path = join(self.this_dir, 'temp', self.__class__.__name__,
self._testMethodName)
self.sys_temp_path = join('/tmp/sa-media-tests', self.__class__.__name__,
self._testMethodName)
self.sys_temp_path = join(
'/tmp/sa-media-tests',
self.__class__.__name__,
self._testMethodName
)
self.base_url = 'http://static1.example.orm'

# Remove previous files, if any! to make a clean temp directory:
Expand All @@ -61,10 +64,15 @@ def setUp(self):

StoreManager.register(
'fs',
functools.partial(FileSystemStore, self.temp_path, self.base_url), default=True
functools.partial(FileSystemStore, self.temp_path, self.base_url),
default=True
)
StoreManager.register(
'temp_fs',
functools.partial(FileSystemStore, self.sys_temp_path, self.base_url)
functools.partial(
FileSystemStore,
self.sys_temp_path,
self.base_url
)
)
super().setUp()

0 comments on commit 07dd8b8

Please sign in to comment.