Merge lp:~canonical-platform-qa/snappy-ecosystem-tests/install-private-snap into lp:snappy-ecosystem-tests

[Omer Akram]

test: register private snap and install it

test: register private snap and install it

[Omer Akram (om26er)]

Note: for snaps to be installable inside a container, the package squashfuse has to be installed, added it as a dependency for snapd.

The `install` method of snapd was broken, this branch fixes that.

Also run_setup would need to be run again to test this as I just pushed an update to my ppa, with fixed staging.

[Santiago Baldassin (sbaldassin)]

Looks great!

review: Approve

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

review: Approve (continuous-integration)

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

FAILED: Autolanding.
Unapproved changes made after approval.
https://platform-qa-jenkins.ubuntu.com/job/snappy-ecosystem-tests-autoland/117/
Executed test runs:
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-land-mp/2821/console

review: Needs Fixing (continuous-integration)

[lp:~canonical-platform-qa/snappy-ecosystem-tests/install-private-snap]

90. By Omer Akram on 2017-03-16

Better name the TestCase class

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

review: Approve (continuous-integration)

=== modified file 'snappy_ecosystem_tests/environment/constants.py'
--- snappy_ecosystem_tests/environment/constants.py	2017-03-10 15:53:13 +0000
+++ snappy_ecosystem_tests/environment/constants.py	2017-03-16 19:28:32 +0000
@@ -24,7 +24,7 @@
 SNAPCRAFT = 'snapcraft'
 
 DEPENDENCIES = {
-    SNAPD: [],
+    SNAPD: ["squashfuse"],
     SNAPCRAFT: [],
     "shared": ["expect"]
 }

=== modified file 'snappy_ecosystem_tests/helpers/snapd/snapd.py'
--- snappy_ecosystem_tests/helpers/snapd/snapd.py	2017-03-13 08:58:43 +0000
+++ snappy_ecosystem_tests/helpers/snapd/snapd.py	2017-03-16 19:28:32 +0000
@@ -111,10 +111,10 @@
 
     def install(self, snap, channel=CHANNEL_STABLE):
         """Install the requested snap."""
-        self.ssh.exec_command(COMMAND_INSTALL.format(snap=snap,
-                                                     channel=channel))
+        self.run_snapd_command_ssh(COMMAND_INSTALL.format(snap=snap,
+                                                          channel=channel))
 
-    def _is_installed(self, snap):
+    def is_installed(self, snap):
         """Return bool representing whether a snap is installed."""
         for installed_snap in Snapd._parse_output(
                 self.run_snapd_command_ssh(COMMAND_LIST)):
@@ -124,7 +124,7 @@
 
     def remove(self, snap):
         """Remove a snap, if its already installed."""
-        if self._is_installed(snap):
+        if self.is_installed(snap):
             self.run_snapd_command_ssh(COMMAND_REMOVE.format(snap=snap))
 
     def info(self, snap, verbose=False):

=== added file 'snappy_ecosystem_tests/tests/commons.py'
--- snappy_ecosystem_tests/tests/commons.py	1970-01-01 00:00:00 +0000
+++ snappy_ecosystem_tests/tests/commons.py	2017-03-16 19:28:32 +0000
@@ -0,0 +1,28 @@
+# -*- 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/>.
+#
+
+"""Module to container common helpers for test."""
+
+import uuid
+
+
+def get_random_snap_name():
+    """Get a random snap name using uuid."""
+    return uuid.uuid4().__str__()

=== added file 'snappy_ecosystem_tests/tests/test_install_private_snap.py'
--- snappy_ecosystem_tests/tests/test_install_private_snap.py	1970-01-01 00:00:00 +0000
+++ snappy_ecosystem_tests/tests/test_install_private_snap.py	2017-03-16 19:28:32 +0000
@@ -0,0 +1,61 @@
+# -*- 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/>.
+#
+
+"""Tests for Installing private snaps."""
+
+from snappy_ecosystem_tests.helpers.snapd.snapd import Snapd
+from snappy_ecosystem_tests.helpers.store_apis.rest_apis import Store
+from snappy_ecosystem_tests.helpers.snapcraft.build_snap import SnapBuilder
+from snappy_ecosystem_tests.helpers.test_base import SnappyEcosystemTestCase
+from snappy_ecosystem_tests.tests.commons import get_random_snap_name
+from snappy_ecosystem_tests.utils.storeconfig import get_store_credentials
+from snappy_ecosystem_tests.utils.user import (
+    get_snapcraft_remote_host_credentials
+)
+
+
+class RegisterInstallPrivateSnapTestCase(SnappyEcosystemTestCase):
+
+    def setUp(self):
+        super().setUp()
+        self.store = Store()
+        self.snapd = Snapd()
+        email, password = get_store_credentials()
+        self.assertTrue(self.snapd.login(email, password))
+        self.addCleanup(self.snapd.logout, email)
+        self.store.login(email, password)
+        self.addCleanup(self.store.logout)
+        self.snap_builder = SnapBuilder(
+            *get_snapcraft_remote_host_credentials())
+
+    def test_upload_and_install_private_snap(self):
+        """Test to register and upload a private snap via the REST API
+        and installing through snapd."""
+        snap_name = get_random_snap_name()
+        self.assertTrue(self.store.register(snap_name, private=True),
+                        'Unable to register snap')
+        # Upload the snap and wait for its processing on server to finish.
+        tracker = self.store.upload(
+            snap_name, self.snap_builder.build_and_pull(snap_name, '0.1'))
+        tracker.track()
+        self.store.release(snap_name, '1', ['stable'])
+        self.snapd.install(snap_name)
+        self.addCleanup(self.snapd.remove, snap_name)
+        self.assertTrue(self.snapd.is_installed, snap_name)

=== modified file 'snappy_ecosystem_tests/tests/test_register_snap.py'
--- snappy_ecosystem_tests/tests/test_register_snap.py	2017-02-21 19:06:58 +0000
+++ snappy_ecosystem_tests/tests/test_register_snap.py	2017-03-16 19:28:32 +0000
@@ -20,11 +20,10 @@
 
 """Tests for Registering a snap name in the store"""
 
-import uuid
-
 from snappy_ecosystem_tests.helpers.snapcraft.client import Snapcraft
 from snappy_ecosystem_tests.helpers.store_apis.rest_apis import Store
 from snappy_ecosystem_tests.helpers.test_base import SnappyEcosystemTestCase
+from snappy_ecosystem_tests.tests.commons import get_random_snap_name
 from snappy_ecosystem_tests.utils.storeconfig import get_store_credentials
 
 
@@ -39,19 +38,11 @@
         self.snapcraft.login()
         self.addCleanup(self.snapcraft.logout)
 
-    @staticmethod
-    def _get_random_snap_name(prefix='ecosystem-test'):
-        """Get a random snap name using uuid
-        :param prefix: the string prefix,
-        if not provided, use default one.
-        """
-        return '{}{}'.format(prefix, int(uuid.uuid4()))
-
     def test_register_public_snap_name_using_snapcraft(self):
         """Test register a public snap name via snapcraft
         and verify it via REST API"""
         # Register snap via Snapcraft
-        snap_name = self._get_random_snap_name()
+        snap_name = get_random_snap_name()
         self.assertTrue(self.snapcraft.register(snap_name),
                         'Unable to register snap')
 
@@ -68,7 +59,7 @@
         """Test register a private snap name via snapcraft
         and verify it via REST API"""
         # Register snap via Snapcraft
-        snap_name = self._get_random_snap_name()
+        snap_name = get_random_snap_name()
         self.assertTrue(self.snapcraft.register(snap_name, private=True),
                         'Unable to register snap')
 
@@ -85,7 +76,7 @@
         """Verify that snapcraft lists a new snap registered via
         RESTful API when using the command snapcraft list-registered"""
         # Register snap via API
-        snap_name = self._get_random_snap_name()
+        snap_name = get_random_snap_name()
         self.assertTrue(self.store.register(snap_name),
                         'Unable to register snap')
 
@@ -102,7 +93,7 @@
         """Verify that snapcraft lists a new private snap registered via
         RESTful API when using the command snapcraft list-registered"""
         # Register snap via API
-        snap_name = self._get_random_snap_name()
+        snap_name = get_random_snap_name()
         self.assertTrue(self.store.register(snap_name, private=True),
                         'Unable to register snap')