Skip to content

Goss: fixed tests to be downstream compatible #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 15, 2016
Merged

Goss: fixed tests to be downstream compatible #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 6 additions & 16 deletions container/root/tests/nginx/base.goss.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,14 @@ group:
command:
nginx -v:
exit-status: 0
stderr: []
stderr: ['nginx/1.']
stdout: ['!/./']
nginx -t:
exit-status: 0
stderr: []
stderr: ['is ok']
stdout: ['!/./']

file:
/etc/nginx/sites-available/default:
exists: true
contains:
- listen 8080;
- root /var/www/html;
- index index.html index.htm;
- client_max_body_size 1m;
- try_files $uri $uri/ =404;
- location ~ /\. {
- access_log off;
- log_not_found off;
- deny all;
/etc/nginx/nginx.conf:
exists: true
contains:
Expand All @@ -51,8 +41,8 @@ file:
- '/#{0}tcp_nodelay\s*on;/'
- '/#{0}tcp_nopush\s*on;/'
- '/#{0}include\s*mime.types;/'
- '/#{0}default_type application/octet-stream;/'
- '/#{0}access_log /dev/stdout main;/'
- '/#{0}default_type\s*application/octet-stream;/'
- '/#{0}access_log\s*/dev/stdout\s*main;/'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

whitespace, oh RegEx you rascal.

- '/#{0}sendfile\s*on;/'
- '/#{0}keepalive_timeout\s*\d+;/'
- '/#{0}client_body_temp_path\s*/tmp/.nginx/client_body;/'
Expand Down
5 changes: 4 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ubuntu:
SERVER_LARGE_CLIENT_HEADER_BUFFERS: 8 16k
SERVER_CLIENT_BODY_BUFFER_SIZE: 128k
volumes:
- ./container/root/goss.nginx.yaml:/goss.nginx.yaml
- ./container/root/tests/nginx/base.goss.yaml:/tests/nginx/base.goss.yaml
- ./container/root/var/www/html:/var/www/html
alpine:
build: .
Expand All @@ -25,3 +25,6 @@ alpine:
S6_KILL_FINISH_MAXTIME: 1
S6_KILL_GRACETIME: 1
SERVER_WORKER_PROCESSES: 1
volumes:
- ./container/root/tests/nginx/base.goss.yaml:/tests/nginx/base.goss.yaml
- ./container/root/var/www/html:/var/www/html