Skip to content

Commit

Permalink
Define pushsnapscript:script.main
Browse files Browse the repository at this point in the history
  • Loading branch information
JohanLorenzo committed Mar 26, 2018
1 parent 7ec3654 commit 994be8c
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 4 deletions.
17 changes: 16 additions & 1 deletion pushsnapscript/script.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
""" Push Snap Script main script
"""
import logging
import os

from scriptworker import client

Expand All @@ -25,4 +26,18 @@ def _log_warning_forewords(context):
log.warn('You do not have the rights to reach Snap store. *All* requests will be mocked.')


__name__ == '__main__' and client.sync_main(async_main)
def get_default_config(base_dir=None):
base_dir = base_dir or os.path.dirname(os.getcwd())
default_config = {
'work_dir': os.path.join(base_dir, 'work_dir'),
'schema_file': os.path.join(os.path.dirname(__file__), 'data', 'push_snap_task_schema.json'),
'verbose': False,
}
return default_config


def main(config_path=None):
return client.sync_main(async_main, config_path=config_path, default_config=get_default_config())


__name__ == '__main__' and main()
6 changes: 3 additions & 3 deletions pushsnapscript/test/integration/test_integration_script.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
import pytest
import tempfile

from scriptworker.client import sync_main
from scriptworker.utils import makedirs

from pushsnapscript.script import async_main
from pushsnapscript.script import main
from pushsnapscript.snap_store import snapcraft_store_client

from scriptworker.test import event_loop
Expand All @@ -28,6 +27,7 @@ def test_script_can_push_snaps_with_credentials(event_loop, monkeypatch, channel
}

task = {
'dependencies': ['some_snap_build_taskId'],
'scopes': ['project:releng:snapcraft:firefox:{}'.format(channel)],
'payload': {
'upstreamArtifacts': [{
Expand Down Expand Up @@ -76,7 +76,7 @@ def TemporaryDirectory():

monkeypatch.setattr(tempfile, 'TemporaryDirectory', TemporaryDirectory)
monkeypatch.setattr(snapcraft_store_client, 'push', snapcraft_store_client_push_fake)
sync_main(async_main, config_path=config_file.name)
main(config_path=config_file.name)

snapcraft_cred_file = os.path.join(temp_dir, '.snapcraft', 'snapcraft.cfg')

Expand Down

0 comments on commit 994be8c

Please sign in to comment.