Merge lp:~canonical-platform-qa/snappy-ecosystem-tests/adding-test-runner into lp:snappy-ecosystem-tests

[Heber Parrucci]

This change includes:

* Adding pytest as a test runner.
* Adding config files
* Adding mechanism to read test data.
* Making pylint more strict: fail when a warning message is returned.

This change includes:

* Adding pytest as a test runner since nose2 has issues when testtools report failures
* Adding config files to store urls, store environment values, etc. And the mechanism to read them.
* Adding mechanism to read test data for users (Can be extended for any entity).
* Making pylint more strict: fail when a warning message is returned.

Can be included in a next iteration:
* Improve selenium config values and page objects.
* read snappy-ecosystem related arguments from commandline.

[platform-qa-bot (platform-qa-bot)]

FAILED: Continuous integration, rev:14
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/25/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/1602/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/25/rebuild

review: Needs Fixing (continuous-integration)

[lp:~canonical-platform-qa/snappy-ecosystem-tests/adding-test-runner]

15. By Heber Parrucci on 2017-02-13

fixing pylint issues

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:15
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/26/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/1603/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/26/rebuild

review: Approve (continuous-integration)

[lp:~canonical-platform-qa/snappy-ecosystem-tests/adding-test-runner]

16. By Heber Parrucci on 2017-02-13

removing print statement

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:16
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/27/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/1604/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/27/rebuild

review: Approve (continuous-integration)

[lp:~canonical-platform-qa/snappy-ecosystem-tests/adding-test-runner]

17. By Heber Parrucci on 2017-02-13

passing filtered arguments to main without modifying the args command line

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:17
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/28/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/1605/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/28/rebuild

review: Approve (continuous-integration)

[I Ahmad (iahmad)]

I would suggest to not check in the credentials to the public bzr branch as bots can pick it up, this should be concealed using the environment variables or if we can find a way to encrypt them at check in time and decrypt it when these were needed for the setup (like travis)

[lp:~canonical-platform-qa/snappy-ecosystem-tests/adding-test-runner]

18. By Heber Parrucci on 2017-02-15

Addressing review feedback regarding credentials:
Now it is read from a user config file that is outside the repo in the host machine. If that config is not found, then it reads the credentials from env variables.
The idea is to store the config with the credentials in a private repository, and then Jenkins will get it and store in the host machine when running the tests.
The same mechanism is used in ubuntu-system-tests.

[Heber Parrucci (heber013)]

> I would suggest to not check in the credentials to the public bzr branch as
> bots can pick it up, this should be concealed using the environment variables
> or if we can find a way to encrypt them at check in time and decrypt it when
> these were needed for the setup (like travis)

Thanks for review!

Now credentials are read from a user config file that is outside the repo in the host machine. If that config is not found, then it reads the credentials from env variables.
The idea is to store the config with the credentials in a private repository, and then Jenkins will get it and store in the host machine when running the tests.
The same mechanism is used in ubuntu-system-tests.

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:18
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/42/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/1627/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-ci/42/rebuild

review: Approve (continuous-integration)

[I Ahmad (iahmad)]

LGTM

review: Approve

=== renamed file 'README' => 'README.rst'
--- README	2017-02-08 14:27:31 +0000
+++ README.rst	2017-02-15 19:16:15 +0000
@@ -1,29 +1,81 @@
-How to setup and execute snappy ecosystem tests
-===============================================
-Please make sure you have following dependencies installed
-1. Python version >= 3.5
-2. nosetests >= 1.3.7
-3. xmlrunner >= 1.7.7
-4. geckodriver webdriver for Firefox >= 0.13.0
-5. chromedriver webdriver for Chrome >= 2.27
-
-Make sure webdrivers are added to $PATH
-
-
-To run the tests checkout the branch follow the below steps
-===========================================================
+Snappy Ecosystem Tests
+######################
+
+Automated system tests for snappy ecosystem: snapcraft, store and snapd.
+
+
+To run the tests checkout the branch and follow the below steps
+===============================================================
 $ bzr branch lp:snappy-ecosystem-tests
 $ cd snappy-ecosystem-tests/
-$ export UBUNTU_STORE_LOGIN_EMAIL=<store account email>
-$ export UBUNTU_STORE_LOGIN_PASSWORD=<store account password>
-$ export STAGING=<1 or 0>, To test against staging or production server respectively
-$ nosetests --with-xunit
-
-
-Running code analysis with pylint
-=================================
+$ ./run_system_tests snappy_ecosystem_tests
+
+It will create a virtual env with all the dependencies defined in requirements.txt and run all the tests
+A pytest runner is used: http://docs.pytest.org/en/latest/
+
+To run all tests in a python package:
+$ ./run_system_tests snappy_ecosystem_tests/tests/example_package
+
+To run all test in a python module:
+$ ./run_system_tests snappy_ecosystem_tests/tests/example_package/example_module.py
+
+To run all tests in a python class:
+$ ./run_system_tests snappy_ecosystem_tests/tests/example_package/example_module.py::ExampleClass
+
+To run a particular test in a python class:
+$ ./run_system_tests snappy_ecosystem_tests/tests/example_package/example_module.py::ExampleClass::example_test
+
+To run a tests that match with a expression:
+./run_system_tests -k stringexpr
+# only run tests with names that match the
+# "string expression", e.g. "MyClass and not method"
+# will select TestMyClass.test_something
+# but not TestMyClass.test_method_simple
+
+You can also specify the arguments as python packages separated by dots:
+$ ./run_system_tests --pyargs tests.example_package.example_module
+Notice that in this case you skip the root dir snappy_ecosystem_tests and for python modules skip the .py
+
+To see all options refer to: http://doc.pytest.org/en/latest/usage.html#specifying-tests-selecting-tests
+
+Tests Results
+=============
+By default the tests results will be stored in 'snappy-ecosystem-results.xml'
+
+Parameters
+==========
+If you are behind a proxy you can specify --proxy option
+All pytest parameters are allowed
+
+Config files
+============
+You can find configurations files in 'config' folder:
+
+ecosystem_tests.cfg stores the snappy ecosystem related config like: APIs urls, Web urls, store to use, etc.
+You can change this config file location by setting the env variable: XDG_CONFIG_HOME
+
+pytest.cfg stores the config related to pytest
+
+Changing store:
+===============
+You can change the store to use in config file ecosystem_tests.cfg
+or by setting the env variable TEST_STORE with values: 'staging' or 'production'.
+It will first try to read the config file, then the env variable and finally
+if none of them are provided it will take 'staging' as default.
+
+
+Running static code analysis and/or unittest
+============================================
 To run static code analysis you can execute from root directory:
-$ ./run_pylint
+$ ./run_checks --static
 It will store the results in pylint-results.txt
-The config file with all the rules is pylint.cfg
+The config file with pylint rules is pylint.cfg
+
+If you want to run unittests:
+$ ./run_checks --unit
+
+If you want to run both:
+$ ./run_checks --all
+
+If you are behind a proxy you can specify --proxy option
 

=== added file 'mk-venv'
--- mk-venv	1970-01-01 00:00:00 +0000
+++ mk-venv	2017-02-15 19:16:15 +0000
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# 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/>.
+#
+
+virtualenv --python=python3 ve
+. ve/bin/activate
+
+
+while [[ $# -gt 1 ]]
+do
+
+key="$1"
+
+case $key in
+    --proxy)
+    proxy="$2"
+    shift # past argument
+    ;;
+esac
+shift # past argument or value
+done
+
+if [ "$proxy" ]; then
+    echo "Using proxy: $proxy to install dependencies"
+    pip install --proxy $proxy -r requirements.txt
+else
+    pip install -r requirements.txt
+fi

=== modified file 'pylint.cfg'
--- pylint.cfg	2017-02-10 18:18:45 +0000
+++ pylint.cfg	2017-02-15 19:16:15 +0000
@@ -99,7 +99,7 @@
 [VARIABLES]
 
 # Tells whether we should check for unused import in __init__ files.
-init-import=no
+init-import=yes
 
 # A regular expression matching the name of dummy variables (i.e. expectedly
 # not used).
@@ -222,7 +222,7 @@
 [FORMAT]
 
 # Maximum number of characters on a single line.
-max-line-length=100
+max-line-length=80
 
 # Regexp for a line that is allowed to be longer than the limit.
 ignore-long-lines=^\s*(# )?<?https?://\S+>?$
@@ -286,7 +286,7 @@
 [MISCELLANEOUS]
 
 # List of note tags to take in consideration, separated by a comma.
-notes=FIXME,XXX,TODO
+notes=
 
 
 [TYPECHECK]
@@ -361,7 +361,7 @@
 max-attributes=7
 
 # Minimum number of public methods for a class (see R0903).
-min-public-methods=2
+min-public-methods=1
 
 # Maximum number of public methods for a class (see R0904).
 max-public-methods=20

=== modified file 'requirements.txt'
--- requirements.txt	2017-02-10 18:18:45 +0000
+++ requirements.txt	2017-02-15 19:16:15 +0000
@@ -1,3 +1,14 @@
+pytest
+testtools
+unittest2
+testscenarios
+fixtures
+selenium
+configparser==3.5.0
+progressbar33==2.4
+requests==2.9.1
+simplejson==3.8.2
+pyxdg==0.25
+jsonschema==2.5.1
 pexpect
-selenium
-unittest2
+chromedriver_installer

=== modified file 'run_checks'
--- run_checks	2017-02-10 19:30:21 +0000
+++ run_checks	2017-02-15 19:16:15 +0000
@@ -35,7 +35,7 @@
     ve_pylint/bin/python3 -m pylint snappy_ecosystem_tests --reports=n --rcfile=pylint.cfg > pylint-results.txt
 
     result=$?
-    if [ $result != 0 ] && [ $result != 4 ]; then 
+    if [ $result != 0 ]; then
         echo -e -n "${RED}Pylint errors. Check pylint output for more information\n"
         exit 1; 
     else

=== added file 'run_system_tests'
--- run_system_tests	1970-01-01 00:00:00 +0000
+++ run_system_tests	2017-02-15 19:16:15 +0000
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# 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/>.
+#
+
+. ./mk-venv "$@"
+
+ve/bin/python3 ./snappy_ecosystem_tests/run.py "$@" -c snappy_ecosystem_tests/configs/pytest.cfg --ignore snappy_ecosystem_tests/unittests/ --junitxml snappy-ecosystem-results.xml
+
+deactivate

=== added file 'setup.py'
--- setup.py	1970-01-01 00:00:00 +0000
+++ setup.py	2017-02-15 19:16:15 +0000
@@ -0,0 +1,48 @@
+#!/usr/bin/env python3
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# 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/>.
+#
+
+import sys
+from setuptools import find_packages, setup
+
+assert sys.version_info >= (3,), 'Python 3 is required'
+
+
+VERSION = '1.0'
+
+
+setup(
+    name='snappy-ecosystem-tests',
+    version=VERSION,
+    description='Automated tests for Snappy Ecosystem.',
+    author='Canonical Platform QA Team',
+    author_email='[e-mail]',
+    url='https://launchpad.net/~snappy-ecosystem-tests-dev',
+    license='GPLv3',
+    packages=find_packages(),
+    package_data={
+        'snappy_ecosystem_tests': ['tests/data/*/*']
+    },
+    entry_points={
+        'console_scripts': [
+            'snappy_ecosystem_tests = snappy_ecosystem_tests.run:main'
+        ]
+    },
+    test_suite='snappy_ecosystem_tests.unittests'
+)

=== added directory 'snappy_ecosystem_tests/commons'
=== added file 'snappy_ecosystem_tests/commons/__init__.py'
--- snappy_ecosystem_tests/commons/__init__.py	1970-01-01 00:00:00 +0000
+++ snappy_ecosystem_tests/commons/__init__.py	2017-02-15 19:16:15 +0000
@@ -0,0 +1,19 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# 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/>.
+#

=== added file 'snappy_ecosystem_tests/commons/config.py'
--- snappy_ecosystem_tests/commons/config.py	1970-01-01 00:00:00 +0000
+++ snappy_ecosystem_tests/commons/config.py	2017-02-15 19:16:15 +0000
@@ -0,0 +1,173 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# 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/>.
+#
+
+"""Manage tests config files: get existing one, create new one and store it"""
+
+import configparser
+import logging
+import os
+
+LOGGER = logging.getLogger(__name__)
+
+DEFAULT_CONF = 'ecosystem_tests.cfg'
+KEY_DEFAULT = 'default'
+
+
+def get_config_dir():
+    """Return the path to the tests configuration directory."""
+    conf_dir = os.environ.get(
+        'XDG_CONFIG_HOME', os.path.realpath(__file__ + '/../../configs'))
+    return conf_dir
+
+
+def get_user_config_dir():
+    """Return the path to the user configuration directory."""
+    conf_dir = os.environ.get(
+        'XDG_USER_CONFIG_HOME', os.path.expanduser('~/.config'))
+    return conf_dir
+
+
+def get_config_section():
+    """Return the name of config section to use."""
+    return os.environ.get('CONFIG_SECTION', KEY_DEFAULT)
+
+
+def _get_config_stack_from_file(file_path):
+    """Return config stack from specified file path."""
+    ecosystem_config = SnappyEcosystemTestsConfig(file_path)
+    ecosystem_config.read_config_from_file()
+    return ecosystem_config
+
+
+class ConfigStack:
+    """Class that represents different config stacks"""
+
+    def __init__(self, dir_path=None, file_name=None):
+        self.__config = self.__create_config_stack(dir_path, file_name)
+
+    @property
+    def config(self):
+        """Return the current config"""
+        return self.__get_config()
+
+    def set_config(self, dir_path=None, file_name=None):
+        """Set the current config for the given dirpath and file name.
+        :param dir_path: the dir in which the config file is located.
+        If None it takes the default one returned by get_config_dir()
+        :param file_name: the config file name.
+        If None it takes the default one stored in DEFAULT_CONF
+        :return the created config as a dict
+        """
+        self.__config = self.__create_config_stack(dir_path, file_name)
+
+    def release_config(self):
+        """Release the current config for those cases that
+         explicitly want to modify it"""
+        self.__config = None
+
+    def __get_config(self):
+        """Get current config. Set it in the case is None"""
+        if self.__config is None:
+            self.set_config()
+        return self.__config
+
+    @staticmethod
+    def __create_config_stack(dir_path=None, file_name=None):
+        """Create the config stack for the given dirpath and file name
+        :param dir_path: the dir in which the config file is located.
+        If None it takes the default one returned by get_config_dir()
+        :param file_name: the config file name.
+        If None it takes the default one stored in DEFAULT_CONF
+        :return the created config as a dict
+        """
+        full_path = os.path.join(dir_path or get_config_dir(),
+                                 file_name or DEFAULT_CONF)
+        return _get_config_stack_from_file(full_path)
+
+
+class SnappyEcosystemTestsConfig:
+
+    """Class to get and save test configuration data."""
+
+    def __init__(self, file_name=None):
+        """
+        Construct the config and parser object.
+        :param file_name: Name of config file to load. Default file is used if
+        value is not specified.
+        """
+        user_config_dir = get_config_dir()
+        if not os.path.exists(user_config_dir):
+            os.mkdir(user_config_dir)
+        self.file_path = os.path.join(
+            user_config_dir, file_name or DEFAULT_CONF)
+        self.config = configparser.ConfigParser(
+            allow_no_value=True, empty_lines_in_values=False)
+
+    def set(self, section, option_name, value):
+        """Set a config value for the given section.
+        :param section: the section of the config in which update
+         the given value
+        :param option_name: Name of config option.
+        :param value: Value to set.
+        """
+        self.config[section][option_name] = value
+        self.save()
+
+    def get(self, section, option_name, default=''):
+        """Get a config value for a given section.
+        If section and/or value are not found, return default if
+        provided or raise exception
+        :param section: the section of the config in which search
+        for the given value.
+        :param option_name: Name of config option to get.
+        :param default: Value to return as default if section and/or
+        item don't exist.
+        :return: Config option value if it exists. In case that section
+        and/or item don't exists,
+        then return default value if provided, or raise exception"""
+        try:
+            return self.config.get(section, option_name)
+        except(configparser.NoSectionError, configparser.NoOptionError):
+            if default:
+                return default
+            else:
+                raise
+
+    def get_section(self, section):
+        """
+        Return a particular section of config
+        :param section: the section name to retrieve
+        :return: a Section object
+        """
+        return self.config[section]
+
+    def save(self):
+        """Save the config to file path"""
+        mode = 'r+' if os.path.exists(self.file_path) else 'w'
+        with open(self.file_path, mode) as _f:
+            self.config.write(_f)
+
+    def read_config_from_file(self):
+        """Read config from file"""
+        self.config.read(self.file_path)
+
+
+CONFIG_STACK = ConfigStack().config
+USER_CONFIG_STACK = ConfigStack(dir_path=get_user_config_dir()).config

=== added directory 'snappy_ecosystem_tests/configs'
=== added file 'snappy_ecosystem_tests/configs/__init__.py'
--- snappy_ecosystem_tests/configs/__init__.py	1970-01-01 00:00:00 +0000
+++ snappy_ecosystem_tests/configs/__init__.py	2017-02-15 19:16:15 +0000
@@ -0,0 +1,19 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# 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/>.
+#

=== added file 'snappy_ecosystem_tests/configs/ecosystem_tests.cfg'
--- snappy_ecosystem_tests/configs/ecosystem_tests.cfg	1970-01-01 00:00:00 +0000
+++ snappy_ecosystem_tests/configs/ecosystem_tests.cfg	2017-02-15 19:16:15 +0000
@@ -0,0 +1,20 @@
+[web-ui]
+browser=chrome
+stage_url=https://myapps.developer.staging.ubuntu.com/
+production_url=https://myapps.developer.ubuntu.com/
+
+[store]
+# store to use in tests. Possible values: staging or production
+environment=staging
+
+[staging_urls]
+root_api=https://myapps.developer.staging.ubuntu.com/dev/api/
+upload=https://upload.apps.staging.ubuntu.com/
+sso=https://login.staging.ubuntu.com/api/v2/
+search=https://search.apps.staging.ubuntu.com/
+
+[production_urls]
+root_api=https://myapps.developer.ubuntu.com/dev/api/
+upload=https://upload.apps.ubuntu.com/
+sso=https://login.ubuntu.com/api/v2/
+search=https://search.apps.ubuntu.com/

=== added file 'snappy_ecosystem_tests/configs/pytest.cfg'
--- snappy_ecosystem_tests/configs/pytest.cfg	1970-01-01 00:00:00 +0000
+++ snappy_ecosystem_tests/configs/pytest.cfg	2017-02-15 19:16:15 +0000
@@ -0,0 +1,2 @@
+[pytest]
+

=== removed file 'snappy_ecosystem_tests/data/__init__.py'
--- snappy_ecosystem_tests/data/__init__.py	2017-02-07 17:41:23 +0000
+++ snappy_ecosystem_tests/data/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-
-#
-# Snappy Ecosystem Tests
-# Copyright (C) 2017 Canonical
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# 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/>.
-#

=== added file 'snappy_ecosystem_tests/helpers/fixture_setup.py'
--- snappy_ecosystem_tests/helpers/fixture_setup.py	1970-01-01 00:00:00 +0000
+++ snappy_ecosystem_tests/helpers/fixture_setup.py	2017-02-15 19:16:15 +0000
@@ -0,0 +1,95 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# 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/>.
+#
+
+"""Manage general tests fixtures"""
+
+import os
+import fixtures
+from snappy_ecosystem_tests.commons.config import CONFIG_STACK
+from snappy_ecosystem_tests.utils.storeconfig import get_current_store
+
+
+class TempCWD(fixtures.TempDir):
+    """Create a temporary directory an cd into it for the test duration."""
+
+    def setUp(self):
+        """Create a temporary directory an cd into it for the test duration."""
+        super().setUp()
+        current_dir = os.getcwd()
+        self.addCleanup(os.chdir, current_dir)
+        os.chdir(self.path)
+
+
+class CleanEnvironment(fixtures.Fixture):
+    """Clean all env variables and restore the original values as
+    clean up process"""
+
+    def setUp(self):
+        super().setUp()
+
+        current_environment = os.environ.copy()
+        os.environ = {}
+
+        self.addCleanup(os.environ.update, current_environment)
+
+
+class SetStoreEnvironmentVariables(fixtures.Fixture):
+    """Configure the env variables for using staging urls"""
+
+    def __init__(self, store):
+        self.store = store
+
+    def setUp(self):
+        super().setUp()
+        urls = CONFIG_STACK.get_section('%s_urls' % self.store)
+
+        self.useFixture(fixtures.EnvironmentVariable(
+            'UBUNTU_STORE_API_ROOT_URL',
+            urls.get('root_api')))
+        self.useFixture(fixtures.EnvironmentVariable(
+            'UBUNTU_STORE_UPLOAD_ROOT_URL',
+            urls.get('upload')))
+        self.useFixture(fixtures.EnvironmentVariable(
+            'UBUNTU_SSO_API_ROOT_URL',
+            urls.get('sso')))
+        self.useFixture(fixtures.EnvironmentVariable(
+            'UBUNTU_STORE_SEARCH_ROOT_URL',
+            urls.get('search')))
+
+
+class SetTestStore(fixtures.Fixture):
+    """Configure the env variables for using the corresponding
+    environment urls"""
+
+    def __init__(self):
+        self.register_delay = -1
+
+    def setUp(self):
+        super().setUp()
+        test_store = get_current_store()
+        self.useFixture(SetStoreEnvironmentVariables(test_store))
+        if test_store == 'staging':
+            self.register_delay = 10
+        elif test_store == 'production':
+            # Use the default server URLs
+            self.register_delay = 180
+        else:
+            raise ValueError(
+                'Unknown test store option: {}'.format(test_store))

=== added file 'snappy_ecosystem_tests/helpers/test_base.py'
--- snappy_ecosystem_tests/helpers/test_base.py	1970-01-01 00:00:00 +0000
+++ snappy_ecosystem_tests/helpers/test_base.py	2017-02-15 19:16:15 +0000
@@ -0,0 +1,32 @@
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*-
+#
+# Copyright (C) 2017 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/>.
+
+"""Base Snappy Ecosystem test"""
+
+import testscenarios
+import testtools
+from snappy_ecosystem_tests.helpers import fixture_setup
+from snappy_ecosystem_tests.helpers.fixture_setup import SetTestStore
+
+
+class SnappyEcosystemTestCase(testscenarios.WithScenarios, testtools.TestCase):
+
+    def setUp(self):
+        super().setUp()
+        temp_cwd_fixture = fixture_setup.TempCWD()
+        self.useFixture(SetTestStore())
+        self.useFixture(temp_cwd_fixture)
+        self.path = temp_cwd_fixture.path

=== removed file 'snappy_ecosystem_tests/helpers/ubuntu_store_tests_base.py'
--- snappy_ecosystem_tests/helpers/ubuntu_store_tests_base.py	2017-02-07 17:41:23 +0000
+++ snappy_ecosystem_tests/helpers/ubuntu_store_tests_base.py	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-
-#
-# Snappy Ecosystem Tests
-# Copyright (C) 2017 Canonical
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# 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/>.
-#

=== renamed file 'snappy_ecosystem_tests/helpers/ubuntu_store_web_test_base.py' => 'snappy_ecosystem_tests/helpers/web_test_base.py'
--- snappy_ecosystem_tests/helpers/ubuntu_store_web_test_base.py	2017-02-07 17:49:25 +0000
+++ snappy_ecosystem_tests/helpers/web_test_base.py	2017-02-15 19:16:15 +0000
@@ -19,8 +19,7 @@
 #
 
 """Web-Ui related functionality for testing web pages using selenium"""
-
-import unittest
+import logging
 
 from selenium import webdriver
 from selenium.webdriver.support.ui import WebDriverWait
@@ -28,7 +27,10 @@
 from selenium.common.exceptions import TimeoutException
 from selenium.webdriver.common.by import By
 
-from snappy_ecosystem_tests import storeconfig
+from snappy_ecosystem_tests.utils import storeconfig
+from snappy_ecosystem_tests.helpers.test_base import SnappyEcosystemTestCase
+
+LOGGER = logging.getLogger(__name__)
 
 LOGIN_EMAIL, LOGIN_PASSWORD = storeconfig.get_store_credentials()
 STORE_URL = storeconfig.get_store_web_url()
@@ -37,12 +39,16 @@
 PAGE_LOAD_TIMEOUT = 30
 
 
-class UbuntuStoreWebTestsBase(unittest.TestCase):
+class UbuntuStoreWebTestsBase(SnappyEcosystemTestCase):
     """Base class to represent a Web-UI test case.
-    Contain basic functionality for locating web elements and interacting with a page
+    Contain basic functionality for locating web elements and
+    interacting with a page
     """
+
     def setUp(self):
-        # TODO - add support for multiple type browsers including Chrome, FF and IE
+        # TODO - add support for multiple type browsers including Chrome,
+        # FF and IE
+        super().setUp()
         options = webdriver.ChromeOptions()
         options.add_argument("--start-maximized")
         self.driver = webdriver.Chrome(chrome_options=options)
@@ -55,7 +61,8 @@
             element_present = EC.presence_of_element_located(locator)
             wait.until(element_present)
         except TimeoutException:
-            print("Timed out waiting for "+locator[1]+" page")
+            LOGGER.error("Timed out waiting for " + locator[1] + " page")
+            raise
 
     def wait_for_page_title(self, title, timeout=PAGE_LOAD_TIMEOUT):
         """Wait for the target page title for given timeout,
@@ -65,7 +72,8 @@
             find_title = EC.title_is(title)
             wait.until(find_title)
         except TimeoutException:
-            print("Timed out waiting for "+title + " page")
+            LOGGER.error("Timed out waiting for " + title + " page")
+            raise
 
     def wait_for_visible(self, timeout=PAGE_LOAD_TIMEOUT):
         # TODO: re-implement to allow any locator as parameter
@@ -77,7 +85,8 @@
                 (By.XPATH, "/html/body/nav/div/div[1]/span"))
             wait.until(element_visible)
         except TimeoutException:
-            print("Timed out waiting for element to be visible")
+            LOGGER.error("Timed out waiting for element to be visible")
+            raise
 
     def wait_for_clickable(self, timeout=PAGE_LOAD_TIMEOUT):
         # TODO: re-implement to allow any locator as parameter
@@ -89,10 +98,12 @@
                 (By.XPATH, "/html/body/nav/div/div[1]/span"))
             wait.until(element_clickable)
         except TimeoutException:
-            print("Timed out waiting for element to be clickable")
+            LOGGER.error("Timed out waiting for element to be clickable")
+            raise
 
     def login(self):
-        """Login to web interface, following the UI flow which end user would use"""
+        """Login to web interface, following the UI flow which end user
+        would use"""
         driver = self.driver
         driver.get(STORE_URL)
 
@@ -111,28 +122,34 @@
         self.wait_for_page_title("Your packages")
 
     def logout(self):
-        """Logout of web interface, following the UI flow which end user would use"""
+        """Logout of web interface, following the UI flow which end
+        user would use"""
         driver = self.driver
         self.wait_for_element((By.CLASS_NAME, "b-dropdown__arrow_light"))
         #
-        # extremely ugly way to reach the desired element by xpath, a bug will be
+        # extremely ugly way to reach the desired element by xpath,
+        # a bug will be
         # raised to uniquely identify the dropdown arrows
         self.wait_for_clickable()
-        down_arrow = driver.find_element_by_xpath("/html/body/nav/div/div[1]/span")
+        down_arrow = driver.find_element_by_xpath(
+            "/html/body/nav/div/div[1]/span")
         #
         # There is a bug with Firefox webdriver when clicking elements,
         # as sometime click doesn't have any effect, to workaround that
-        # multiple attempts are made. However everything works fine with chrome webdriver.
+        # multiple attempts are made. However everything works fine with
+        # chrome webdriver.
 
         for _ in range(0, 2):
             wait = WebDriverWait(self.driver, 1)
             try:
                 down_arrow.click()
-                element_present = EC.presence_of_element_located((By.CLASS_NAME, "b-dropdown_open"))
+                element_present = EC.presence_of_element_located(
+                    (By.CLASS_NAME, "b-dropdown_open"))
                 wait.until(element_present)
                 break
             except TimeoutException:
-                print("Failed to open the accounts dropdown menu card, Trying again")
+                LOGGER.error("Failed to open the accounts dropdown menu card,"
+                             " Trying again")
 
         self.wait_for_visible()
         logout_link = driver.find_element_by_link_text("Log out")
@@ -141,5 +158,6 @@
         self.wait_for_page_title("Sign in to see your packages")
 
     def tearDown(self):
+        super().tearDown()
         self.driver.close()
         self.driver.quit()

=== added file 'snappy_ecosystem_tests/run.py'
--- snappy_ecosystem_tests/run.py	1970-01-01 00:00:00 +0000
+++ snappy_ecosystem_tests/run.py	2017-02-15 19:16:15 +0000
@@ -0,0 +1,47 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# 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/>.
+#
+
+"""Entry point to run snappy ecosystem tests"""
+
+import re
+import sys
+import pytest
+
+FILTER_ARGUMENTS = '--proxy'
+
+
+def _filter_arguments():
+    """Remove from command line arguments all the ones that are in
+     FILTER_ARGUMENTS list."""
+    filtered_args = sys.argv[1:]
+    for i, arg in enumerate(sys.argv[1:]):
+        if arg in FILTER_ARGUMENTS:
+            filtered_args.pop(i + 1)
+            filtered_args.pop(i)
+    return filtered_args
+
+
+def _parse_arguments():
+    """Parse and filter command line arguments to makethem pytest compatible"""
+    sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
+    return _filter_arguments()
+
+if __name__ == '__main__':
+    sys.exit(pytest.main(args=_parse_arguments() + ['-p', 'no:cacheprovider']))

=== added directory 'snappy_ecosystem_tests/snapcraft'
=== added file 'snappy_ecosystem_tests/snapcraft/__init__.py'
--- snappy_ecosystem_tests/snapcraft/__init__.py	1970-01-01 00:00:00 +0000
+++ snappy_ecosystem_tests/snapcraft/__init__.py	2017-02-15 19:16:15 +0000
@@ -0,0 +1,19 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# 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/>.
+#

=== renamed file 'snappy_ecosystem_tests/utils/snapcraft.py' => 'snappy_ecosystem_tests/snapcraft/snapcraft.py'
--- snappy_ecosystem_tests/utils/snapcraft.py	2017-02-07 17:49:25 +0000
+++ snappy_ecosystem_tests/snapcraft/snapcraft.py	2017-02-15 19:16:15 +0000
@@ -18,43 +18,23 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-"""Snapcraft related helpers to configure the snapcraft environment: staging or production
-and other specific functions inside Snapcraft class
-"""
+"""Snapcraft client helpers"""
 
-import os
 import pexpect
 
 
 # login credentials exported by shell environment
-from snappy_ecosystem_tests import storeconfig
+from snappy_ecosystem_tests.utils import storeconfig
 
 LOGIN_EMAIL, LOGIN_PASSWORD = storeconfig.get_store_credentials()
 
 
-def set_snapcraft_environment():
-    """set the environment variables for snapcraft communication with store,
-    this will be staging by default. if STAGING environment variable is
-    set to 0, then it will be set to production"""
-    if storeconfig.is_staging():
-        os.environ["UBUNTU_STORE_SEARCH_ROOT_URL"] = 'https://search.apps.staging.ubuntu.com/'
-        os.environ["UBUNTU_STORE_UPLOAD_ROOT_URL"] = 'https://upload.apps.staging.ubuntu.com/'
-        os.environ["UBUNTU_SSO_API_ROOT_URL"] = 'https://login.staging.ubuntu.com/api/v2/'
-        os.environ["UBUNTU_STORE_API_ROOT_URL"] = \
-            'https://myapps.developer.staging.ubuntu.com/dev/api/'
-    else:
-        os.environ["UBUNTU_STORE_SEARCH_ROOT_URL"] = 'https://search.apps.ubuntu.com/'
-        os.environ["UBUNTU_STORE_UPLOAD_ROOT_URL"] = 'https://upload.apps.ubuntu.com/'
-        os.environ["UBUNTU_SSO_API_ROOT_URL"] = 'https://login.ubuntu.com/api/v2/'
-        os.environ["UBUNTU_STORE_API_ROOT_URL"] = 'https://myapps.developer.ubuntu.com/dev/api/'
-
-
 class Snapcraft(object):
-    """Contain Snapcraft specific functionality to use via command line interface"""
+    """Contain Snapcraft specific functionality to use via command
+    line interface"""
     def __init__(self):
         """Create new snapcraft instance."""
         self._login = False
-        set_snapcraft_environment()
         self._cleanup()
 
     def _cleanup(self):
@@ -86,7 +66,9 @@
         self._login = True
 
     def list_registered(self):
-        """call snapcraft list-registered command, raise exception if not logged in"""
+        """call snapcraft list-registered command,
+        raise exception if not logged in"""
         if self._login is False:
-            raise ValueError("User is not logged in, please login before using this command")
+            raise ValueError("User is not logged in, "
+                             "please login before using this command")
         return pexpect.spawnu("snapcraft list-registered").read()

=== added directory 'snappy_ecosystem_tests/snapd'
=== added file 'snappy_ecosystem_tests/snapd/__init__.py'
--- snappy_ecosystem_tests/snapd/__init__.py	1970-01-01 00:00:00 +0000
+++ snappy_ecosystem_tests/snapd/__init__.py	2017-02-15 19:16:15 +0000
@@ -0,0 +1,19 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# 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/>.
+#

=== renamed file 'snappy_ecosystem_tests/utils/snapd.py' => 'snappy_ecosystem_tests/snapd/snapd.py'
=== added directory 'snappy_ecosystem_tests/tests'
=== removed directory 'snappy_ecosystem_tests/tests'
=== added file 'snappy_ecosystem_tests/tests/__init__.py'
--- snappy_ecosystem_tests/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ snappy_ecosystem_tests/tests/__init__.py	2017-02-15 19:16:15 +0000
@@ -0,0 +1,19 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# 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/>.
+#

=== removed file 'snappy_ecosystem_tests/tests/__init__.py'
--- snappy_ecosystem_tests/tests/__init__.py	2017-02-07 17:49:25 +0000
+++ snappy_ecosystem_tests/tests/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-
-#
-# Snappy Ecosystem Tests
-# Copyright (C) 2017 Canonical
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# 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/>.
-#

=== renamed directory 'snappy_ecosystem_tests/data' => 'snappy_ecosystem_tests/tests/data'
=== added directory 'snappy_ecosystem_tests/tests/data/entity'
=== added file 'snappy_ecosystem_tests/tests/data/entity/entity.json'
--- snappy_ecosystem_tests/tests/data/entity/entity.json	1970-01-01 00:00:00 +0000
+++ snappy_ecosystem_tests/tests/data/entity/entity.json	2017-02-15 19:16:15 +0000
@@ -0,0 +1,6 @@
+{
+  "entity": [
+    {
+    }
+  ]
+}
\ No newline at end of file

=== renamed file 'snappy_ecosystem_tests/test_store_login.py' => 'snappy_ecosystem_tests/tests/test_store_login.py'
--- snappy_ecosystem_tests/test_store_login.py	2017-02-07 19:44:37 +0000
+++ snappy_ecosystem_tests/tests/test_store_login.py	2017-02-15 19:16:15 +0000
@@ -20,11 +20,12 @@
 
 """Test for Login to the Store via Web Interface, snapcraft and snapd"""
 
-from snappy_ecosystem_tests.utils.snapcraft import Snapcraft
-from snappy_ecosystem_tests.helpers.ubuntu_store_web_test_base import UbuntuStoreWebTestsBase
+from snappy_ecosystem_tests.snapcraft.snapcraft import Snapcraft
+from snappy_ecosystem_tests.helpers.web_test_base import UbuntuStoreWebTestsBase
 
 
 class StoreLoginTestCase(UbuntuStoreWebTestsBase):
+
     def setUp(self):
         super().setUp()
 
@@ -40,7 +41,8 @@
 
         self.login()
         self.assertEqual(self.driver.title, "Your packages", "Failed to login")
-        # TODO - fragile as there is no unique way to identify the dropdown arrow
+        # TODO - fragile as there is no unique way to identify
+        # the dropdown arrow
         self.logout()
         self.assertEqual(
             self.driver.title, "Sign in to see your packages",

=== modified file 'snappy_ecosystem_tests/unittests/test_snapcraft.py'
--- snappy_ecosystem_tests/unittests/test_snapcraft.py	2017-02-10 20:22:24 +0000
+++ snappy_ecosystem_tests/unittests/test_snapcraft.py	2017-02-15 19:16:15 +0000
@@ -22,8 +22,10 @@
 
 from unittest2 import TestCase
 
+
 class SnapcraftTestCase(TestCase):
 
     def test_snapcraft_dummy_test(self):
         """Dummy test case"""
-        self.assertTrue(True)
+        _a = True
+        self.assertTrue(_a)

=== added file 'snappy_ecosystem_tests/utils/json.py'
--- snappy_ecosystem_tests/utils/json.py	1970-01-01 00:00:00 +0000
+++ snappy_ecosystem_tests/utils/json.py	2017-02-15 19:16:15 +0000
@@ -0,0 +1,30 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# 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/>.
+#
+
+"""Manage json files"""
+
+import json
+
+
+def read_json_from_file(file_path):
+    """Read a json from the given file path and return it as a dict"""
+    with open(file_path) as _f:
+        data_json = json.load(_f)
+    return data_json

=== added file 'snappy_ecosystem_tests/utils/singleton.py'
--- snappy_ecosystem_tests/utils/singleton.py	1970-01-01 00:00:00 +0000
+++ snappy_ecosystem_tests/utils/singleton.py	2017-02-15 19:16:15 +0000
@@ -0,0 +1,38 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# 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/>.
+#
+
+"""Singleton utils"""
+
+
+class Singleton(type):
+    """Class that represents a singleton entity.
+    Usage: Specify metaclass=Singleton in those classes you want to be
+    Singleton.
+    Example: MyClass(metaclass=Singleton).
+    And automatically the same instance will be returned when creating
+    MyClass objects.
+    """
+    __instances = {}
+
+    def __call__(cls, *args, **kwargs):
+        if cls not in cls.__instances:
+            cls.__instances[cls] = super(Singleton, cls).__call__(
+                *args, **kwargs)
+        return cls.__instances[cls]

=== renamed file 'snappy_ecosystem_tests/storeconfig.py' => 'snappy_ecosystem_tests/utils/storeconfig.py'
--- snappy_ecosystem_tests/storeconfig.py	2017-02-07 17:41:23 +0000
+++ snappy_ecosystem_tests/utils/storeconfig.py	2017-02-15 19:16:15 +0000
@@ -18,25 +18,34 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-"""Helpers to retrieve store configuration data like: credentials, urls, etc"""
+"""Get all the store related data like credentials, urls"""
 
 import os
 
-KEY_ENVIRON_STORE_LOGIN_EMAIL = 'UBUNTU_STORE_LOGIN_EMAIL'
-KEY_ENVIRON_STORE_LOGIN_PASSWORD = 'UBUNTU_STORE_LOGIN_PASSWORD'
-URL_WEB_STORE_PRODUCTION = 'https://myapps.developer.ubuntu.com/'
-URL_WEB_STORE_STAGING = 'https://myapps.developer.staging.ubuntu.com/'
+from snappy_ecosystem_tests.commons.config import (
+    CONFIG_STACK,
+    USER_CONFIG_STACK
+)
+
+URL_WEB_STORE_PRODUCTION = CONFIG_STACK.get('web-ui', 'production_url')
+URL_WEB_STORE_STAGING = CONFIG_STACK.get('web-ui', 'stage_url')
 
 
 def get_store_credentials():
-    """login credentials exported by shell environment"""
-    return os.environ['UBUNTU_STORE_LOGIN_EMAIL'], \
-        os.environ['UBUNTU_STORE_LOGIN_PASSWORD']
+    """Get user store credentials.
+    It will retrieve the credentials stored in a user config file,
+    if the config is not found,
+    then it will return the ones provided in environment variables
+    """
+    return (USER_CONFIG_STACK.get('user', 'user_email',
+                                  default=os.environ.get('user_email')),
+            USER_CONFIG_STACK.get('user', 'user_password',
+                                  default=os.environ.get('user_password')))
 
 
 def is_staging():
     """Return False if environment variable PROD is exported"""
-    return os.environ.get('STAGING', "1") == "1"
+    return get_current_store() == 'staging'
 
 
 def get_store_web_url():
@@ -44,3 +53,14 @@
     if optional staging argument is false then it will return
     production server url """
     return URL_WEB_STORE_STAGING if is_staging() else URL_WEB_STORE_PRODUCTION
+
+
+def get_current_store():
+    """
+    Return the current configured store. It will first read the config value,
+    if no config value is set, it will read the env variable TEST_STORE,
+    if that env variable is not set, then it returns staging as default
+    :return: current configured store environment
+    """
+    return CONFIG_STACK.get('store', 'environment',
+                            os.getenv('TEST_STORE', 'staging'))

=== added file 'snappy_ecosystem_tests/utils/test_data.py'
--- snappy_ecosystem_tests/utils/test_data.py	1970-01-01 00:00:00 +0000
+++ snappy_ecosystem_tests/utils/test_data.py	2017-02-15 19:16:15 +0000
@@ -0,0 +1,46 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# 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/>.
+#
+
+"""Parse and get all tests data that will be used during test execution"""
+
+import os
+
+from snappy_ecosystem_tests.utils.json import read_json_from_file
+
+# Test data dirs
+DIR_TESTS = os.path.realpath(__file__ + '/../../tests')
+DIR_TEST_DATA = os.path.join(DIR_TESTS, 'data')
+DIR_TEST_DATA_ENTITY = os.path.join(DIR_TEST_DATA, 'entity')
+
+# Test data files
+ENTITY_FILE = os.path.join(DIR_TEST_DATA_ENTITY, 'entity.json')
+
+
+class EntityStack:
+    """Class store an entity that is read as
+    test data in json files"""
+
+    def __init__(self):
+        self.__entities = read_json_from_file(ENTITY_FILE)
+
+    @property
+    def entities(self):
+        """Get the current entities"""
+        return self.__entities