Merge lp:~sergiusens/snapcraft/pypy-config-test into lp:~ted/snapcraft/python-pip

[Sergio Schvezov]

setup.py using pypy to setup a config integration test

[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

Unmerged revisions

=== modified file 'bin/snapcraft'
--- bin/snapcraft	2015-07-15 09:04:52 +0000
+++ bin/snapcraft	2015-09-17 19:10:29 +0000
@@ -31,4 +31,3 @@
 if __name__ == "__main__":
     snapcraft.dirs.setup_dirs()
     snapcraft.main.main()
-    

=== modified file 'debian/control'
--- debian/control	2015-09-16 11:47:20 +0000
+++ debian/control	2015-09-17 19:10:29 +0000
@@ -6,43 +6,34 @@
                cmake,
                debhelper (>= 9),
                dh-python,
-               git,
-               mercurial,
-               pep8,
-               plainbox,
-               pyflakes,
                python3 (>= 3.4),
                python3-apt,
-               python3-fixtures,
                python3-jsonschema,
-               python3-mccabe,
-               python3-requests,
                python3-setuptools,
-               python3-testscenarios,
                python3-yaml,
                ubuntu-snappy-cli,
                wget,
-               xz-utils,
+               xz-utils
 Homepage: https://launchpad.net/snapcraft
 Vcs-Bzr: lp:snapcraft
 Standards-Version: 3.9.6
 
 Package: snapcraft
 Architecture: all
-Depends: ${misc:Depends},
-         ${python3:Depends},
-         bzr,
+Depends: bzr,
          dpkg-dev,
          git,
+         mercurial,
          python3-apt,
          python3-jsonschema,
          python3-requests,
          python3-yaml,
-         mercurial,
          sudo,
          ubuntu-snappy-cli,
          wget,
          xz-utils,
+         ${misc:Depends},
+         ${python3:Depends}
 Description: easily craft snaps
  Snapcraft aims to make upstream developers' lives easier and as such is not
  a single toolset, but instead is a collection of tools that enable the

=== modified file 'debian/rules'
--- debian/rules	2015-08-25 20:40:26 +0000
+++ debian/rules	2015-09-17 19:10:29 +0000
@@ -3,9 +3,3 @@
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
-
-override_dh_auto_test:
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	python3 setup.py test
-endif
-

=== added directory 'debian/tests'
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2015-09-17 19:10:29 +0000
@@ -0,0 +1,10 @@
+Test-Command: ./runtests.sh
+Restrictions: allow-stderr, isolation-container
+Depends: @,
+         build-essential,
+         pep8,
+         plainbox,
+         pyflakes,
+         python3-fixtures,
+         python3-mccabe,
+         python3-testscenarios

=== added directory 'integration-tests/data/pypy-config'
=== added file 'integration-tests/data/pypy-config/config.py'
--- integration-tests/data/pypy-config/config.py	1970-01-01 00:00:00 +0000
+++ integration-tests/data/pypy-config/config.py	2015-09-17 19:10:29 +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/pypy-config/icon.png'
Binary files integration-tests/data/pypy-config/icon.png	1970-01-01 00:00:00 +0000 and integration-tests/data/pypy-config/icon.png	2015-09-17 19:10:29 +0000 differ
=== added file 'integration-tests/data/pypy-config/setup.py'
--- integration-tests/data/pypy-config/setup.py	1970-01-01 00:00:00 +0000
+++ integration-tests/data/pypy-config/setup.py	2015-09-17 19:10:29 +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/pypy-config/snapcraft.yaml'
--- integration-tests/data/pypy-config/snapcraft.yaml	1970-01-01 00:00:00 +0000
+++ integration-tests/data/pypy-config/snapcraft.yaml	2015-09-17 19:10:29 +0000
@@ -0,0 +1,12 @@
+name: pypy-config
+version: 1
+vendor: Vendor <[e-mail]>
+summary: test summary
+description: test desc
+icon: icon.png
+config: python3 usr/bin/config.py
+
+parts:
+  config:
+    type: python3-project
+    source: .

=== added file 'integration-tests/runtests.sh'
--- integration-tests/runtests.sh	1970-01-01 00:00:00 +0000
+++ integration-tests/runtests.sh	2015-09-17 19:10:29 +0000
@@ -0,0 +1,48 @@
+#!/bin/bash
+# -*- Mode:sh; indent-tabs-mode:nil; tab-width:4 -*-
+#
+# Copyright (C) 2015 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set -e
+
+if [ -z "$SNAPCRAFT" ]; then
+    export SNAPCRAFT=snapcraft
+fi
+
+# Create a temporary directory so that we can run 'manage.py develop' and
+# create the .provider file there
+temp_dir=$(mktemp -d)
+# Develop the provider, this will let us run tests on it
+./manage.py develop -d $temp_dir
+# Set PROVIDERPATH (see plainbox(1)) so that we can see the provider
+# without installing it.
+export PROVIDERPATH=$PROVIDERPATH:$temp_dir
+# Run the 'normal' test plan
+plainbox run \
+    -T 2015.com.canonical.snapcraft::normal \
+    -f json -o $temp_dir/result.json
+# Analyze the result and fail if there are any failures
+python3 - << __PYTHON__
+import json
+with open("$temp_dir/result.json", "rt", encoding="utf-8") as stream:
+    results = json.load(stream)
+failed = False
+for test_id, result in sorted(results['result_map'].items()):
+    print('{0}: {1}'.format(test_id, result['outcome']))
+    if result['outcome'] != 'pass':
+        failed = True
+print("Overall: {0}".format("fail" if failed else "pass"))
+raise SystemExit(failed)
+__PYTHON__

=== modified file 'integration-tests/units/jobs.pxu'
--- integration-tests/units/jobs.pxu	2015-09-17 15:14:49 +0000
+++ integration-tests/units/jobs.pxu	2015-09-17 19:10:29 +0000
@@ -81,6 +81,19 @@
     test -e stage/slash
     test "$(./stage/bin/test)" = "tarproject"
 
+id: snapcraft/normal/pypy-config
+plugin: shell
+estimated_duration: 0.3
+command:
+    set -ex
+    cp -rT $PLAINBOX_PROVIDER_DATA/pypy-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
+
 id: snapcraft/normal/simple-make
 plugin: shell
 estimated_duration: 0.3

=== modified file 'runtests.sh'
--- runtests.sh	2015-09-15 14:45:57 +0000
+++ runtests.sh	2015-09-17 19:10:29 +0000
@@ -69,39 +69,12 @@
         python3-coverage erase
         export PROJECT_PATH=$(pwd)
         export SNAPCRAFT=snapcraft-coverage
-    else
-        export SNAPCRAFT=snapcraft
     fi
 
     # Go to the plainbox provider of snapcraft tests
-    cd integration-tests/
-    # Create a temporary directory so that we can run 'manage.py develop' and
-    # create the .provider file there
-    temp_dir=$(mktemp -d)
-    # Develop the provider, this will let us run tests on it
-    ./manage.py develop -d $temp_dir
-    # Set PROVIDERPATH (see plainbox(1)) so that we can see the provider
-    # without installing it.
-    export PROVIDERPATH=$PROVIDERPATH:$temp_dir
-    # Run the 'normal' test plan
-    plainbox run \
-        -T 2015.com.canonical.snapcraft::normal \
-        -f json -o $temp_dir/result.json
-    # Analyze the result and fail if there are any failures
-    python3 - << __PYTHON__
-import json
-with open("$temp_dir/result.json", "rt", encoding="utf-8") as stream:
-    results = json.load(stream)
-failed = False
-for test_id, result in sorted(results['result_map'].items()):
-    print('{0}: {1}'.format(test_id, result['outcome']))
-    if result['outcome'] != 'pass':
-        failed = True
-print("Overall: {0}".format("fail" if failed else "pass"))
-raise SystemExit(failed)
-__PYTHON__
+    cd integration-tests
+    ./runtests.sh
 )
-
 fi
 
 if which python3-coverage >/dev/null 2>&1; then