Merge lp:~sergiusens/snapcraft/pypy-config-test into lp:~snappy-dev/snapcraft/core

[Sergio Schvezov]

setup.py using pypy to setup a config integration test

[Leo Arias (elopio)]

I find it a little confusing that the part is also called config. Not sure what to do about it. That's not required, right? You could define any name for the part?

The test passes and excercises the code, that's good.

+ test -f ./snap/meta/hooks/config

IMO, this check is not enough. The best test would be to try to configure the installed snap, but as we still have some things to figure out for that, it would be good to check that the config file contains the same line that was defined on the yaml.

Needs fixing to add a check for the content of snap/meta/hooks/config

review: Needs Fixing

[lp:~sergiusens/snapcraft/pypy-config-test]

176. By Sergio Schvezov on 2015-09-17

s/pypy/pypi/ and description and summary updated

177. By Sergio Schvezov on 2015-09-17

check hook

[Leo Arias (elopio)]

thanks.

review: Approve

=== added directory 'integration-tests/data/pypi-config'
=== added file 'integration-tests/data/pypi-config/config.py'
--- integration-tests/data/pypi-config/config.py	1970-01-01 00:00:00 +0000
+++ integration-tests/data/pypi-config/config.py	2015-09-17 20:34:40 +0000
@@ -0,0 +1,57 @@
+#!/usr/bin/env python3
+
+import os
+import os.path
+import sys
+import yaml
+
+_CONFIG = 'configuration'
+
+_DEFAULT_INTERVAL = 10
+
+
+def main():
+    config_file = os.path.join(os.environ['SNAP_APP_DATA_PATH'], _CONFIG)
+
+    config_yaml = yaml.load(sys.stdin)
+    if config_yaml:
+        set_config(config_file, config_yaml)
+
+    yaml.dump(get_config(config_file), stream=sys.stdout, default_flow_style=False)
+
+
+def set_config(config_file, config_yaml={}):
+    with open(config_file, 'w') as f:
+        yaml.dump(_config(config_yaml), stream=f, default_flow_style=False)
+
+    return config_yaml
+
+
+def get_config(config_file):
+    try:
+        with open(config_file) as f:
+            return yaml.load(f)
+    except FileNotFoundError:
+        return _config()
+
+
+def _config(config_yaml={}):
+    try:
+        interval_value = config_yaml['config'][os.environ['SNAP_NAME']]['interval']
+        if not isinstance(interval_value, int):
+            config_yaml['config'][os.environ['SNAP_NAME']]['interval'] = _DEFAULT_INTERVAL
+    except KeyError:
+        interval = {
+            'config': {
+                os.environ['SNAP_NAME']: {
+                    'interval': _DEFAULT_INTERVAL
+                }
+            }
+        }
+        config_yaml.update(interval)
+
+    return config_yaml
+
+
+if __name__ == '__main__':
+    main()

=== added file 'integration-tests/data/pypi-config/icon.png'
Binary files integration-tests/data/pypi-config/icon.png	1970-01-01 00:00:00 +0000 and integration-tests/data/pypi-config/icon.png	2015-09-17 20:34:40 +0000 differ
=== added file 'integration-tests/data/pypi-config/setup.py'
--- integration-tests/data/pypi-config/setup.py	1970-01-01 00:00:00 +0000
+++ integration-tests/data/pypi-config/setup.py	2015-09-17 20:34:40 +0000
@@ -0,0 +1,16 @@
+#!/usr/bin/env python3
+
+from setuptools import setup
+
+setup(
+    name='config',
+    description='config for webcam-webui',
+    author='Sergio Schvezov <[e-mail]>',
+    license='GPLv3',
+    install_requires=[
+        'pyyaml',
+    ],
+    scripts=[
+        'config.py',
+    ],
+)

=== added file 'integration-tests/data/pypi-config/snapcraft.yaml'
--- integration-tests/data/pypi-config/snapcraft.yaml	1970-01-01 00:00:00 +0000
+++ integration-tests/data/pypi-config/snapcraft.yaml	2015-09-17 20:34:40 +0000
@@ -0,0 +1,16 @@
+name: pypi-config
+version: 1
+vendor: Vendor <[e-mail]>
+summary: Create a snappy config hook using setup.py
+description: |
+ The object is to setup a snappy config hook to setup configuration based
+ on python code.
+
+ This package will download its dependencies from pypi.
+icon: icon.png
+config: python3 usr/bin/config.py
+
+parts:
+  config:
+    type: python3-project
+    source: .

=== modified file 'integration-tests/units/jobs.pxu'
--- integration-tests/units/jobs.pxu	2015-09-17 18:07:51 +0000
+++ integration-tests/units/jobs.pxu	2015-09-17 20:34:40 +0000
@@ -81,6 +81,20 @@
     test -e stage/slash
     test "$(./stage/bin/test)" = "tarproject"
 
+id: snapcraft/normal/pypi-config
+plugin: shell
+estimated_duration: 0.3
+command:
+    set -ex
+    cp -rT $PLAINBOX_PROVIDER_DATA/pypi-config .
+    ${SNAPCRAFT} snap
+    test -f ./stage/usr/bin/config.py
+    test -f ./stage/usr/bin/python3
+    test -f ./snap/usr/bin/config.py
+    test -f ./snap/usr/bin/python3
+    test -f ./snap/meta/hooks/config
+    grep -q 'exec "python3" usr/bin/config.py $*' ./snap/meta/hooks/config
+
 id: snapcraft/normal/simple-make
 plugin: shell
 estimated_duration: 0.3