Merge lp:~fgallina/ols-store-tests/register-name-window-updates into lp:~ubuntuone-pqm-team/ols-store-tests/store-acceptance-tests

[Fabián Ezequiel Gallina]

Update store acceptance tests for name registration

[Matias Bordese (matiasb)]

Looks good, but I have a question.

[Matias Bordese (matiasb)]

review: Approve

[Matias Bordese (matiasb)]

LGTM, thanks

review: Approve

[Fabián Ezequiel Gallina (fgallina)]

LGTM, last commit from a separate already approved branch to enable landings once again.

review: Approve

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/ols-store-acceptance-tests/1/

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/ols-store-acceptance-tests/2/

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/ols-store-acceptance-tests/3/

[Vincent Ladeuil (vila)]

18:01:58 E: ======================================================================
18:01:58 E: ERROR: test_create_customer_success (snap.test_snap_purchases_customers.CreateCustomerTestCase)
18:01:58 E: ----------------------------------------------------------------------
18:01:58 E: (Network error: ProxyError: HTTPSConnectionPool(host='api.stripe.com', port=443): Max retries exceeded with url: /v1/tokens (Caused by ProxyError('Cannot connect to proxy.', OSError('Tunnel connection failed: 403 Forbidden',))))

should be fixed by https://code.launchpad.net/~vila/canonical-is-puppet/jaas_ols_slaves-to-api_stripe_com/+merge/318731

=== modified file '.bzrignore'
--- .bzrignore	2016-09-19 13:15:06 +0000
+++ .bzrignore	2017-03-01 16:59:34 +0000
@@ -1,2 +1,2 @@
 env
-branches/
+branches/*

=== modified file 'Makefile'
--- Makefile	2016-09-19 16:49:12 +0000
+++ Makefile	2017-03-01 16:59:34 +0000
@@ -22,27 +22,7 @@
 install-wheels: $(ENV)
 	$(PIP) install --find-links=$(WHEELS_DIR) --no-index $(ARGS)
 
-vm-setup: ols-vms.conf dependencies.txt
-	if [ `ols-vms status ${VM}` = 'RUNNING' ] ; then ols-vms stop ${VM} ; fi
-	ols-vms setup ${VM}
-	touch vm-setup
-
-vm-built: vm-setup
-	if [ `ols-vms status ${VM}` = 'UNKNOWN' ] ; then $(MAKE) vm-setup ; fi
-
-vm-started: vm-built
-	if [ `ols-vms status ${VM}` = 'STOPPED' ] ; then ols-vms start ${VM} ; fi
-
-vm-up-to-date: vm-started
-	${VSSH} 'sudo apt-get update && sudo apt-get upgrade -y'
-
-branch-up-to-date:
-	${VSSH} 'cd work && bzr pull --overwrite'
-
-store-versions: vm-started
-	${VSSH} 'cd work && ./get_store_versions.py'
-
-test: vm-up-to-date branch-up-to-date store-versions
+test: bootstrap
 	@${VSSH} 'cd work && \
 		TEST_USER_EMAIL=$(TEST_USER_EMAIL) \
 		TEST_USER_PASSWORD=$(TEST_USER_PASSWORD) \
@@ -50,5 +30,5 @@
 		STRIPE_PUBLISHABLE_KEY=$(STRIPE_PUBLISHABLE_KEY) \
 		make api-tests'
 
-api-tests: bootstrap
+api-tests:
 	$(PYTHON) -u -m unittest $(TEST_TARGET)

=== modified file 'README'
--- README	2016-08-18 12:49:56 +0000
+++ README	2017-03-01 16:59:34 +0000
@@ -73,3 +73,26 @@
 Then you can run the tests against your local devportal instance like::
 
    $ SCA_ROOT_URL=http://<ip>:<port> make api-tests
+
+ols jenkaas setup
+=================
+
+Merge proposals are gated on https://jenkins.ols.canonical.com which relies
+on ols-vms (from ppa:ubuntuone/ols-tests) to setup the lxd container defined
+in ols-vms.conf.
+
+Setting up the same container locally is done with:
+
+$ ols-vms setup store-acceptance-tests -Olxd.user_mounts=~:/home/ubuntu,<path to secrets>:/home/ubuntu/.config/ols-store-acceptance-tests
+
+``<path to secrets`` should contain a ``secrets`` file exporting the
+TEST_USER_EMAIL, TEST_USER_PASSWORD, TEST_USER_NAMESPACE and
+STRIPE_PUBLISHABLE_KEY.
+
+Once the container is setup you can enter it with:
+
+$ ols-vms shell store-acceptance-tests
+
+Once there, 'cd' to your mounted working dir and 'make bootstrap'.
+
+ols jenkaas use './run-landing-tests.sh'.

=== modified file 'dependencies.txt'
--- dependencies.txt	2016-10-12 12:44:51 +0000
+++ dependencies.txt	2017-03-01 16:59:34 +0000
@@ -1,3 +1,4 @@
+bzr
 make
 squashfs-tools
 snapcraft

=== modified file 'ols-vms.conf'
--- ols-vms.conf	2016-09-19 14:52:54 +0000
+++ ols-vms.conf	2017-03-01 16:59:34 +0000
@@ -4,12 +4,4 @@
 vm.architecture = amd64
 vm.update = True
 vm.locale = en_US.UTF-8
-lxd.image = ubuntu:{vm.release}/{vm.architecture}
 vm.packages = @dependencies.txt, bzr
-# Not the best solution but good enough until jenkaas: this requires the
-# following 'secrets' file to exist on the dev host and on jenkins slaves
-# and contain 'export' statements for the env vars needed by the tests.
-# FIXME: A better solution would be a config file by host or by job
-# providing as many options as needed by the tests. -- vila 2016-07-08
-vm.uploaded_scripts = ~/.config/ols-store-tests/secrets
-vm.setup_scripts = setup-dev-env

=== added file 'run-landing-tests.sh'
--- run-landing-tests.sh	1970-01-01 00:00:00 +0000
+++ run-landing-tests.sh	2017-03-01 16:59:34 +0000
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# The following is set from the host either by copying the file in the right
+# place or by mounting the relevant directory inside the container.
+SECRETS=~/.config/ols-store-acceptance-tests/secrets
+test -f ${SECRETS} && . ${SECRETS}
+
+make api-tests
+

=== removed file 'setup-dev-env'
--- setup-dev-env	2016-07-11 12:23:00 +0000
+++ setup-dev-env	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-#!/bin/sh -ex
-# Use a proper locale
-sudo locale-gen en_US.UTF-8
-# Register needed hosts
-cat <<EOKH > ~/.ssh/known_hosts
-bazaar.launchpad.net,91.189.90.11,91.189.95.84 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEApuXd4MHTfr1qLXWeClxTTQYZQblCA+nHvbjAjowkEd2Y4kpvntJOVewoSwa22zTbiYSmmssCuCkFHwcpnZBZN5qMWewjizav30WfeyLR5Kng5qucxmFAEkNJjCJiu194wRNKu0cD99Uk/6X/AfsWGLgmL5pa5UFk62aW+iZLUQ8=
-EOKH
-chmod 600 ~/.ssh/known_hosts
-# Clone branch
-bzr branch lp:~ubuntuone-pqm-team/ols-store-tests/store-acceptance-tests work

=== modified file 'tests/api/cpi/test_package.py'
--- tests/api/cpi/test_package.py	2016-08-08 20:26:28 +0000
+++ tests/api/cpi/test_package.py	2017-03-01 16:59:34 +0000
@@ -66,7 +66,7 @@
             'icon_url',
             'icon_urls',
             'id',
-            'is_published',
+            'release_map',
             'keywords',
             'last_updated',
             'license',

=== modified file 'tests/api/cpi/test_snaps.py'
--- tests/api/cpi/test_snaps.py	2016-09-14 20:05:35 +0000
+++ tests/api/cpi/test_snaps.py	2017-03-01 16:59:34 +0000
@@ -55,7 +55,7 @@
             'icon_url',
             'icon_urls',
             'id',
-            'is_published',
+            'release_map',
             'keywords',
             'last_updated',
             'license',

=== modified file 'tests/api/snap/test_register_name.py'
--- tests/api/snap/test_register_name.py	2016-08-24 05:39:11 +0000
+++ tests/api/snap/test_register_name.py	2017-03-01 16:59:34 +0000
@@ -1,5 +1,6 @@
 from __future__ import unicode_literals
 
+import math
 import json
 import time
 import uuid
@@ -54,7 +55,9 @@
         self.package_name = 'delete-me-{}'.format(str(uuid.uuid4().int)[:32])
 
     def assert_snap_id(self, response):
-        self.assertIn('snap_id', response.json())
+        data = response.json()
+        self.assertIn('snap_id', data)
+        self.assertIsNotNone(data['snap_id'])
 
     def assert_no_snap_id(self, response):
         snap_id = response.json().get('snap_id')
@@ -138,44 +141,75 @@
         self.assertEqual(response.status_code, 429)
         self.assertIn('Retry-After', response.headers)
         retry_after = response.headers['Retry-After']
+        minutes = math.ceil(float(retry_after) / 60.0)
+        minutes_text = 'minute'
+        if minutes != 1:
+            minutes_text += 's'
         body = response.json()
+        detail = (
+            'You can register up to 10 snap names every 10\xa0minutes. '
+            'You must wait %s\xa0%s before the next snap-name '
+            'registration.'
+        ) % (minutes, minutes_text)
         expected = {
             'status': 429,
             'code': 'register_window',
             'title': 'You must wait before next name registration.',
-            'detail': 'You must wait 1\xa0minute before the next snap-name '
-                    'registration for 16.',
+            'detail': detail,
             'retry_after': int(retry_after),
             'type': u'devportal:v1:name-window-wait',
             'error_list': [{
                 'code': 'register_window',
-                'message': 'You must wait 1\xa0minute before the next snap-name '
-                        'registration for 16.',
+                'message': detail,
             }]
         }
         self.assertEqual(body, expected)
 
-    def assert_invalid_request(self, response):
+    def assert_invalid_series(self, response):
         self.assertEqual(response.status_code, 400)
         body = response.json()
+        detail = (
+            'Select a valid choice. That choice is not one of the available '
+            'choices.')
         expected = {
-            'invalid_params': [
-                {'reason': 'Select a valid choice. That choice is not one of '
-                           'the available choices.',
-                 'code': 'invalid_choice',
-                 'name': u'series'}
-            ],
+            'invalid_params': [{
+                'reason': detail,
+                'code': 'invalid_choice',
+                'name': 'series'}],
             'status': 400,
             'type': 'devportal:v1:request-invalid',
             'detail': 'Submitted data is not valid.',
             'title': 'Invalid request.',
             'error_list': [{
-                'message': 'Select a valid choice. That choice is not one of the available choices.',
+                'message': detail,
                 'code': 'invalid_choice',
                 'extra': {'name': 'series'}}]
         }
         self.assertEqual(body, expected)
 
+    def assert_invalid_snap_name(self, response, snap_name):
+        self.assertEqual(response.status_code, 400)
+        body = response.json()
+        detail = (
+            "The package name '%s' is not valid. "
+            "It can only contain lowercase ascii letters, numbers and hyphens."
+        ) % snap_name
+        expected = {
+            'invalid_params': [{
+                'reason': detail,
+                'code': 'invalid',
+                'name': 'snap_name'}],
+            'status': 400,
+            'type': 'devportal:v1:request-invalid',
+            'detail': 'Submitted data is not valid.',
+            'title': 'Invalid request.',
+            'error_list': [{
+                'message': detail,
+                'code': 'invalid',
+                'extra': {'name': 'snap_name'}}]
+        }
+        self.assertEqual(body, expected)
+
     def test_register_name_successful(self):
         response = register_name(self.package_name, auth=self.auth)
         self.assert_success(response)
@@ -206,23 +240,33 @@
         self.assert_reserved_name(response, name)
 
     def test_register_name_too_fast(self):
-        register_name(self.package_name, auth=self.auth)
-        response = register_name(
-            self.package_name, auth=self.auth, retry=False)
+        # Attempt to hit the limit, short-circuit earlier if possible.
+        for idx in range(10 + 1):
+            response = register_name(
+                self.package_name + '-%s' % idx, auth=self.auth, retry=False)
+            if response.status_code == 429:
+                break
+
         self.assert_error(response)
         self.assert_retry_after(response)
 
     def test_register_name_for_series(self):
-        response = register_name(self.package_name, series='16',
-                                 auth=self.auth)
+        response = register_name(
+            self.package_name, series='16', auth=self.auth)
         self.assert_success(response)
         self.assert_snap_id(response)
 
     def test_register_name_for_invalid_series(self):
-        response = register_name(self.package_name, series='invalid',
-                                 auth=self.auth)
-        self.assert_error(response)
-        self.assert_invalid_request(response)
+        response = register_name(
+            self.package_name, series='invalid', auth=self.auth)
+        self.assert_error(response)
+        self.assert_invalid_series(response)
+
+    def test_register_invalid_name(self):
+        snap_name = self.package_name + ' invalid'
+        response = register_name(snap_name, auth=self.auth)
+        self.assert_error(response)
+        self.assert_invalid_snap_name(response, snap_name)
 
     def test_register_private_name(self):
         response = register_name(self.package_name, is_private=True,

=== modified file 'tests/api/snap/test_snap_release.py'
--- tests/api/snap/test_snap_release.py	2016-08-18 12:49:56 +0000
+++ tests/api/snap/test_snap_release.py	2017-03-01 16:59:34 +0000
@@ -111,9 +111,14 @@
                 {'channel': 'stable', 'info': 'none'},
                 {'channel': 'candidate', 'info': 'none'},
                 {'channel': 'beta', 'info': 'none'},
-                {'revision': revision, 'channel': 'edge', 'info': 'specific',
-                 'version': version}
-            ]
+                {'channel': 'edge', 'revision': revision,
+                 'info': 'specific', 'version': version}],
+            'channel_map_tree': {'latest': {'16': {'all': [
+                {'channel': 'stable', 'info': 'none'},
+                {'channel': 'candidate', 'info': 'none'},
+                {'channel': 'beta', 'info': 'none'},
+                {'channel': 'edge', 'revision': revision,
+                 'info': 'specific', 'version': version}]}}},
         })
 
     def assert_error_body(self, response):