Skip to content
Snippets Groups Projects
Commit de27e282 authored by Stéphane Diemer's avatar Stéphane Diemer
Browse files

Changed some tests exit codes (refs #20453).

parent 792a4370
No related branches found
No related tags found
No related merge requests found
...@@ -3,5 +3,7 @@ ...@@ -3,5 +3,7 @@
set -e set -e
if ( which nginx >/dev/null ); then if ( which nginx >/dev/null ); then
nginx -t nginx -t
else
exit 2
fi fi
...@@ -10,6 +10,7 @@ import sys ...@@ -10,6 +10,7 @@ import sys
if not os.path.exists('/etc/nginx'): if not os.path.exists('/etc/nginx'):
print('Nginx dir does not exists, test skipped.') print('Nginx dir does not exists, test skipped.')
sys.exit(2)
else: else:
print('Checking http://127.0.0.1:1080/nginx_status response.') print('Checking http://127.0.0.1:1080/nginx_status response.')
try: try:
......
...@@ -20,7 +20,7 @@ This script checks for all enabled vhosts in Nginx conf that: ...@@ -20,7 +20,7 @@ This script checks for all enabled vhosts in Nginx conf that:
nginx_dir = '/etc/nginx/sites-enabled' nginx_dir = '/etc/nginx/sites-enabled'
if not os.path.exists(nginx_dir): if not os.path.exists(nginx_dir):
print('Nginx dir does not exists ("%s").' % nginx_dir) print('Nginx dir does not exists ("%s").' % nginx_dir)
sys.exit(0) sys.exit(2)
# check that Wowza is installed # check that Wowza is installed
wowza_dir = '/usr/local/WowzaStreamingEngine' wowza_dir = '/usr/local/WowzaStreamingEngine'
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright 2017, Florent Thiery # Copyright 2017, Florent Thiery
''' '''
Check that the server is synchronized with the configured NTP server. Checks that the server is synchronized with the configured NTP server.
''' '''
import os import os
import sys import sys
......
...@@ -9,7 +9,7 @@ import sys ...@@ -9,7 +9,7 @@ import sys
if not os.path.exists('/etc/postfix'): if not os.path.exists('/etc/postfix'):
print('Postfix dir does not exists, test skipped.') print('Postfix dir does not exists, please install postfix.')
sys.exit(1) sys.exit(1)
else: else:
# check that postfix listens the port 25 correctly # check that postfix listens the port 25 correctly
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment