Skip to content

Commit daca4aa

Browse files
mboersmamboersma
committed
Merge pull request #210 from opdemand/122-acceptance-test
Travis-CI is down, github is flaky, merging while I have a window.
2 parents 98350c3 + 639c530 commit daca4aa

21 files changed

Lines changed: 782 additions & 227 deletions

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ nosetests.xml
3939

4040
# Deis' config file
4141
deis/local_settings.py
42+
.secret_key
4243

4344
# deis application logs
4445
logs/

‎Makefile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,14 @@ db:
66
python manage.py migrate
77

88
test:
9-
python manage.py test api client cm provider web
9+
python manage.py test api cm provider web
1010

1111
coverage:
12-
coverage run manage.py test api client cm provider web
12+
coverage run manage.py test api cm provider web
1313
coverage html
1414

15+
test_client:
16+
python -m unittest discover client.tests
17+
1518
flake8:
1619
flake8

‎client/tests/__init__.py‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
11
"""
22
Tests for the command-line client for the Deis system.
33
"""
4+
5+
from .test_apps import * # noqa
6+
from .test_auth import * # noqa
7+
from .test_builds import * # noqa
8+
from .test_config import * # noqa
9+
from .test_containers import * # noqa
10+
from .test_flavors import * # noqa
11+
from .test_formations import * # noqa
12+
from .test_git import * # noqa
13+
from .test_keys import * # noqa
14+
from .test_layers import * # noqa
15+
from .test_misc import * # noqa
16+
from .test_nodes import * # noqa
17+
from .test_providers import * # noqa
18+
from .test_releases import * # noqa

‎client/tests/test_app.py‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎client/tests/test_apps.py‎

Lines changed: 158 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,158 @@
1+
"""
2+
Unit tests for the Deis CLI apps commands.
3+
4+
Run these tests with "python -m unittest client.tests.test_apps"
5+
or with "./manage.py test client.AppsTest".
6+
"""
7+
8+
from __future__ import unicode_literals
9+
from unittest import TestCase
10+
from uuid import uuid4
11+
import json
12+
import re
13+
14+
import pexpect
15+
16+
from .utils import DEIS
17+
from .utils import DEIS_TEST_FLAVOR
18+
from .utils import random_repo
19+
from .utils import setup
20+
from .utils import teardown
21+
22+
23+
class AppsTest(TestCase):
24+
25+
@classmethod
26+
def setUpClass(cls):
27+
repo_name, repo_url = random_repo()
28+
cls.username, cls.password, cls.repo_dir = setup(repo_url)
29+
# create a new formation
30+
cls.formation = "{}-test-formation-{}".format(
31+
cls.username, uuid4().hex[:4])
32+
child = pexpect.spawn("{} formations:create {} --flavor={}".format(
33+
DEIS, cls.formation, DEIS_TEST_FLAVOR))
34+
child.expect("created {}.*to scale a basic formation".format(
35+
cls.formation))
36+
child.expect(pexpect.EOF)
37+
38+
@classmethod
39+
def tearDownClass(cls):
40+
# delete the formation
41+
child = pexpect.spawn("{} formations:destroy {} --confirm={}".format(
42+
DEIS, cls.formation, cls.formation))
43+
child.expect('done in ', timeout=5*60)
44+
child.expect(pexpect.EOF)
45+
teardown(cls.username, cls.password, cls.repo_dir)
46+
47+
def test_create(self):
48+
# create the app
49+
self.assertIsNotNone(self.formation)
50+
child = pexpect.spawn("{} create --formation={}".format(
51+
DEIS, self.formation))
52+
child.expect('done, created (?P<name>[-_\w]+)')
53+
app = child.match.group('name')
54+
child.expect('Git remote deis added')
55+
child.expect(pexpect.EOF)
56+
# check that it's in the list of apps
57+
child = pexpect.spawn("{} apps".format(DEIS))
58+
child.expect('=== Apps')
59+
child.expect(pexpect.EOF)
60+
apps = re.findall(r'([-_\w]+) {\w?}', child.before)
61+
self.assertIn(app, apps)
62+
# destroy the app
63+
child = pexpect.spawn("{} apps:destroy --confirm={}".format(DEIS, app))
64+
child.expect('Git remote deis removed')
65+
child.expect(pexpect.EOF)
66+
67+
def test_destroy(self):
68+
# create the app
69+
self.assertIsNotNone(self.formation)
70+
child = pexpect.spawn("{} apps:create --formation={}".format(
71+
DEIS, self.formation))
72+
child.expect('done, created ([-_\w]+)')
73+
app = child.match.group(1)
74+
child.expect(pexpect.EOF)
75+
# check that it's in the list of apps
76+
child = pexpect.spawn("{} apps".format(DEIS))
77+
child.expect('=== Apps')
78+
child.expect(pexpect.EOF)
79+
apps = re.findall(r'([-_\w]+) {\w?}', child.before)
80+
self.assertIn(app, apps)
81+
# destroy the app
82+
child = pexpect.spawn("{} destroy --confirm={}".format(DEIS, app))
83+
child.expect("Destroying {}".format(app))
84+
child.expect('done in \d+s')
85+
child.expect('Git remote deis removed')
86+
child.expect(pexpect.EOF)
87+
88+
def test_list(self):
89+
# list apps and get their names
90+
child = pexpect.spawn("{} apps".format(DEIS))
91+
child.expect('=== Apps')
92+
child.expect(pexpect.EOF)
93+
apps_before = re.findall(r'([-_\w]+) {\w?}', child.before)
94+
# create a new app
95+
self.assertIsNotNone(self.formation)
96+
child = pexpect.spawn("{} apps:create --formation={}".format(
97+
DEIS, self.formation))
98+
child.expect('done, created ([-_\w]+)')
99+
app = child.match.group(1)
100+
child.expect(pexpect.EOF)
101+
# list apps and get their names
102+
child = pexpect.spawn("{} apps".format(DEIS))
103+
child.expect('=== Apps')
104+
child.expect(pexpect.EOF)
105+
apps = re.findall(r'([-_\w]+) {\w?}', child.before)
106+
# test that the set of names contains the previous set
107+
self.assertLess(set(apps_before), set(apps))
108+
# delete the app
109+
child = pexpect.spawn("{} apps:destroy --app={} --confirm={}".format(
110+
DEIS, app, app))
111+
child.expect('done in ', timeout=5*60)
112+
child.expect(pexpect.EOF)
113+
# list apps and get their names
114+
child = pexpect.spawn("{} apps:list".format(DEIS))
115+
child.expect('=== Apps')
116+
child.expect(pexpect.EOF)
117+
apps = re.findall(r'([-_\w]+) {\w?}', child.before)
118+
# test that the set of names is equal to the original set
119+
self.assertEqual(set(apps_before), set(apps))
120+
121+
def test_info(self):
122+
# create a new app
123+
self.assertIsNotNone(self.formation)
124+
child = pexpect.spawn("{} create --formation={}".format(
125+
DEIS, self.formation))
126+
child.expect('done, created (?P<name>[-_\w]+)')
127+
app = child.match.group('name')
128+
child.expect('Git remote deis added')
129+
child.expect(pexpect.EOF)
130+
# get app info
131+
child = pexpect.spawn("{} info".format(DEIS))
132+
child.expect("=== {} Application".format(app))
133+
child.expect("=== {} Containers".format(app))
134+
response = json.loads(child.before)
135+
child.expect(pexpect.EOF)
136+
self.assertEqual(response['id'], app)
137+
self.assertEqual(response['formation'], self.formation)
138+
self.assertEqual(response['owner'], self.username)
139+
self.assertIn('uuid', response)
140+
self.assertIn('created', response)
141+
self.assertIn('containers', response)
142+
# delete the app
143+
child = pexpect.spawn("{} apps:destroy --app={} --confirm={}".format(
144+
DEIS, app, app))
145+
child.expect('done in ', timeout=5*60)
146+
child.expect(pexpect.EOF)
147+
148+
# def test_calculate(self):
149+
# pass
150+
151+
# def test_open(self):
152+
# pass
153+
154+
# def test_logs(self):
155+
# pass
156+
157+
# def test_run(self):
158+
# pass

‎client/tests/test_auth.py‎

Lines changed: 33 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,46 @@
1-
21
"""
3-
Unit tests for authentication in the CLI.
2+
Unit tests for the Deis CLI auth commands.
43
5-
Run these tests with "python -m unittest deis.tests.test_auth"
6-
or all tests with "python -m unittest discover".
7-
""" # pylint: disable=C0103,R0201,R0904
4+
Run these tests with "python -m unittest client.tests.test_auth"
5+
or with "./manage.py test client.AuthTest".
6+
"""
87

9-
import os
10-
import unittest
8+
from __future__ import unicode_literals
9+
from unittest import TestCase
1110

1211
import pexpect
1312

13+
from .utils import DEIS
14+
from .utils import DEIS_SERVER
15+
from .utils import setup
16+
from .utils import teardown
1417

15-
# Locate the 'of' executable script relative to this file.
16-
CLI = os.path.abspath(
17-
os.path.join(os.path.dirname(__file__), '..', 'deis'))
18-
19-
20-
class TestLogin(unittest.TestCase):
2118

22-
"""Test authentication in the CLI."""
19+
class AuthTest(TestCase):
2320

24-
def setUp(self):
25-
# TODO: set up the CLI/api/fixtures/tests.json...somehow
26-
self.child = pexpect.spawn('{} login'.format(CLI))
21+
@classmethod
22+
def setUpClass(cls):
23+
cls.username, cls.password, _ = setup()
2724

28-
def tearDown(self):
29-
self.child = None
25+
@classmethod
26+
def tearDownClass(cls):
27+
teardown(cls.username, cls.password, None)
3028

31-
def test_good_login(self):
32-
"""Test that a valid login responds with a success message."""
33-
child = self.child
34-
child.expect('username:')
35-
child.sendline('autotest')
36-
child.expect('password:')
37-
child.sendline('password')
38-
child.expect('Logged in as autotest.')
39-
# call a protected API endpoint to ensure we were authenticated
40-
child = self.child = pexpect.spawn('{} apps'.format(CLI))
41-
child.expect('^\S+ +\(.+\)')
42-
43-
def test_bad_login(self):
44-
"""Test that an invalid login responds with a failure message."""
45-
child = self.child
46-
child.expect('username:')
47-
child.sendline('autotest')
48-
child.expect('password:')
49-
child.sendline('Pa55w0rd')
50-
child.expect('Login failed.')
51-
# call a protected API endpoint to ensure we get an unauth error
52-
child = self.child = pexpect.spawn('{} apps'.format(CLI))
53-
child.expect("\('Error")
29+
def test_login(self):
30+
# log in the interactive way
31+
child = pexpect.spawn("{} login {}".format(DEIS, DEIS_SERVER))
32+
child.expect('username: ')
33+
child.sendline(self.username)
34+
child.expect('password: ')
35+
child.sendline(self.password)
36+
child.expect("Logged in as {}".format(self.username))
37+
child.expect(pexpect.EOF)
5438

5539
def test_logout(self):
56-
child = self.child = pexpect.spawn('{} logout'.format(CLI))
57-
child.expect('Logged out.')
58-
# call a protected API endpoint to ensure we get an unauth error
59-
child = self.child = pexpect.spawn('{} apps'.format(CLI))
60-
child.expect("\('Error")
61-
62-
63-
class TestHelp(unittest.TestCase):
64-
65-
"""Test that the client can document its own behavior."""
66-
67-
def test_version(self):
68-
"""Test that the client reports its help message."""
69-
child = pexpect.spawn('{} --help'.format(CLI))
70-
child.expect(r'Usage: .*number of proxies\s+$')
71-
child = pexpect.spawn('{} -h'.format(CLI))
72-
child.expect(r'Usage: .*number of proxies\s+$')
73-
child = pexpect.spawn('{} help'.format(CLI))
74-
child.expect(r'Usage: .*number of proxies\s+$')
75-
76-
77-
class TestVersion(unittest.TestCase):
78-
79-
"""Test that the client can report its version string."""
80-
81-
def test_version(self):
82-
"""Test that the client reports its version string."""
83-
child = pexpect.spawn('{} --version'.format(CLI))
84-
child.expect('Deis CLI 0.0.1')
85-
child = pexpect.spawn('{} -v'.format(CLI))
86-
child.expect('Deis CLI 0.0.1')
40+
child = pexpect.spawn("{} logout".format(DEIS))
41+
child.expect('Logged out')
42+
# log in the one-liner way
43+
child = pexpect.spawn("{} login {} --username={} --password={}".format(
44+
DEIS, DEIS_SERVER, self.username, self.password))
45+
child.expect("Logged in as {}".format(self.username))
46+
child.expect(pexpect.EOF)

0 commit comments

Comments
 (0)