Skip to content

Commit 12199fc

Browse files
committed
Docker compose now able to fully run a set of tests
1 parent 23eb6ff commit 12199fc

File tree

6 files changed

+13
-9
lines changed

6 files changed

+13
-9
lines changed

docker-compose.yml renamed to docker/v93/docker-compose.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "2"
22

33
services:
44
sut:
5-
build: .
5+
build: ../../.
66
links:
77
- gitlab
88
depends_on:
@@ -13,4 +13,6 @@ services:
1313
expose:
1414
- "80"
1515
environment:
16-
GITLAB_OMNIBUS_CONFIG: gitlab_rails['initial_root_password'] = "5iveL!fe"
16+
GITLAB_OMNIBUS_CONFIG: gitlab_rails['initial_root_password'] = "5iveL!fe"
17+
logging:
18+
driver: none

integration_cov

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/env bash
2-
sleep 60
3-
coverage run -m unittest discover -s integration_tests.tests_v91 && coverage html
2+
sleep 30
3+
coverage run -m unittest discover -s integration_tests.tests_v93 && coverage html

integration_tests/base.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66

77

88
def log_to_term(var_name, response):
9-
try:
10-
print('\r\r{}: {}\r\r'.format(var_name, response.keys()))
11-
except:
12-
print('\r\r{}: {}\r\r'.format(var_name, response))
9+
print('\r\r', var_name, ':', response, '\r\r')
10+
# try:
11+
# print('\r\n\r\n{}: {}\r\n\r\n'.format(var_name, response.keys()))
12+
# except:
13+
# print('\r\r{}: {}\r\r'.format(var_name, response))
1314

1415

1516
class BaseTest(TestCase):

response_data/users.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
get_users = [{'last_activity_on': None, 'can_create_group': True, 'projects_limit': 100, 'name': 'Administrator', 'created_at': '2017-05-16T03:18:46.206+05:30', 'identities': [], 'email': 'admin@example.com', 'skype': '', 'state': 'active', 'location': None, 'organization': None, 'username': 'root', 'web_url': 'http://localhost:10080/root', 'avatar_url': 'http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon', 'website_url': '', 'color_scheme_id': 1, 'external': False, 'id': 1, 'two_factor_enabled': False, 'is_admin': True, 'confirmed_at': '2017-05-16T03:18:45.874+05:30', 'twitter': '', 'can_create_project': True, 'linkedin': '', 'bio': None, 'current_sign_in_at': '2017-05-16T03:30:38.288+05:30', 'last_sign_in_at': '2017-05-16T03:30:38.288+05:30'}]
2-
post_users = {'can_create_project': True, 'location': None, 'projects_limit': 100, 'two_factor_enabled': False, 'confirmed_at': None, 'organization': None, 'is_admin': False, 'username': 'test1', 'name': 'test', 'color_scheme_id': 1, 'twitter': '', 'id': 5, 'state': 'active', 'email': 'example@example.com', 'external': False, 'identities': [], 'bio': None, 'skype': '', 'last_activity_on': None, 'last_sign_in_at': None, 'website_url': '', 'avatar_url': 'http://www.gravatar.com/avatar/23463b99b62a72f26ed677cc556c44e8?s=80&d=identicon', 'web_url': 'http://localhost:10080/test1', 'created_at': '2017-05-16T05:00:51.936+05:30', 'current_sign_in_at': None, 'can_create_group': True, 'linkedin': ''}
2+
post_users = {'skype': '', 'bio': None, 'identities': [], 'can_create_group': True, 'two_factor_enabled': False, 'created_at': '2017-07-10T20:49:35.009Z', 'linkedin': '', 'email': 'test@example.com', 'confirmed_at': None, 'current_sign_in_at': None, 'projects_limit': 100000, 'location': None, 'id': 21, 'organization': None, 'username': 'test', 'external': False, 'name': 'test', 'last_activity_on': None, 'color_scheme_id': 1, 'twitter': '', 'can_create_project': True, 'web_url': 'http://778d15cbc5e9/test', 'website_url': '', 'avatar_url': 'http://www.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0?s=80&d=identicon', 'state': 'active', 'last_sign_in_at': None}
3+
post_users_keys = ['color_scheme_id', 'external', 'id', 'organization', 'state', 'two_factor_enabled', 'created_at', 'twitter', 'location', 'name', 'bio', 'last_activity_on', 'avatar_url', 'can_create_group', 'skype', 'can_create_project', 'username', 'confirmed_at', 'projects_limit', 'current_sign_in_at', 'website_url', 'identities', 'linkedin', 'last_sign_in_at', 'web_url', 'email']
34
post_users_error = '{"message": "Email has already been taken"}'
45
delete_user = {}

0 commit comments

Comments
 (0)