Update error messages in sanity tests
Update error messages throughout sanity tests
to use the same (or similar) format of error message.
Change-Id: I4db0517a5b264151ddaa6ea2c2a04d37e139944e
Related-PROD: #PROD-32415
diff --git a/test_set/cvp-sanity/tests/test_ui_addresses.py b/test_set/cvp-sanity/tests/test_ui_addresses.py
index 22e4a7f..5e6ccdb 100644
--- a/test_set/cvp-sanity/tests/test_ui_addresses.py
+++ b/test_set/cvp-sanity/tests/test_ui_addresses.py
@@ -16,9 +16,8 @@
param='curl -k {0}://{1}/auth/login/ 2>&1 | \
grep Login'.format(proto, IP),
expr_form='pillar')
- assert len(result) != 0, \
- 'Horizon login page is not reachable on {} from ctl nodes'.format(
- IP[0])
+ assert len(result) != 0, (
+ 'Horizon login page is not reachable on {} from ctl nodes.'.format(IP))
@pytest.mark.smoke
@@ -31,11 +30,12 @@
url = "{}://{}:{}/v3".format(proto, IP, port)
result = local_salt_client.cmd(
tgt=ctl_nodes_pillar,
- param='curl -k {}/ 2>&1 | \
- grep stable'.format(url),
+ param='curl -k {}/ 2>&1 | grep stable'.format(url),
expr_form='pillar')
- assert len(result[result.keys()[0]]) != 0, \
- 'Public Openstack url is not reachable on {} from ctl nodes'.format(url)
+ assert len(result[result.keys()[0]]) != 0, (
+ 'Public Openstack url is not reachable on {} from ctl '
+ 'nodes'.format(url)
+ )
@pytest.mark.sl_dup
@@ -52,12 +52,12 @@
url = "{}://{}:{}".format(proto, IP, port)
result = local_salt_client.cmd(
tgt=ctl_nodes_pillar,
- param='curl -k {}/app/kibana 2>&1 | \
- grep loading'.format(url),
+ param='curl -k {}/app/kibana 2>&1 | grep loading'.format(url),
expr_form='pillar')
- assert len(result[result.keys()[0]]) != 0, \
- 'Internal Kibana login page is not reachable on {} ' \
- 'from ctl nodes'.format(url)
+ assert len(result[result.keys()[0]]) != 0, (
+ 'Internal Kibana login page is not reachable on {} from ctl '
+ 'nodes'.format(url)
+ )
@pytest.mark.smoke
@@ -70,12 +70,12 @@
url = "{}://{}:{}".format(proto, IP, port)
result = local_salt_client.cmd(
tgt=ctl_nodes_pillar,
- param='curl -k {}/app/kibana 2>&1 | \
- grep loading'.format(url),
+ param='curl -k {}/app/kibana 2>&1 | grep loading'.format(url),
expr_form='pillar')
- assert len(result[result.keys()[0]]) != 0, \
- 'Public Kibana login page is not reachable on {} ' \
- 'from ctl nodes'.format(url)
+ assert len(result[result.keys()[0]]) != 0, (
+ 'Public Kibana login page is not reachable on {} from ctl '
+ 'nodes'.format(url)
+ )
@pytest.mark.sl_dup
@@ -89,12 +89,12 @@
url = "{}://{}:{}".format(protocol, IP, port)
result = local_salt_client.cmd(
tgt=ctl_nodes_pillar,
- param='curl {}/graph 2>&1 | \
- grep Prometheus'.format(url),
+ param='curl {}/graph 2>&1 | grep Prometheus'.format(url),
expr_form='pillar')
- assert len(result[result.keys()[0]]) != 0, \
- 'Internal Prometheus page is not reachable on {} ' \
- 'from ctl nodes'.format(url)
+ assert len(result[result.keys()[0]]) != 0, (
+ 'Internal Prometheus page is not reachable on {} from ctl '
+ 'nodes'.format(url)
+ )
@pytest.mark.smoke
@@ -107,12 +107,12 @@
url = "{}://{}:{}".format(proto, IP, port)
result = local_salt_client.cmd(
tgt=ctl_nodes_pillar,
- param='curl -k {}/graph 2>&1 | \
- grep Prometheus'.format(url),
+ param='curl -k {}/graph 2>&1 | grep Prometheus'.format(url),
expr_form='pillar')
- assert len(result[result.keys()[0]]) != 0, \
- 'Public Prometheus page is not reachable on {} ' \
- 'from ctl nodes'.format(url)
+ assert len(result[result.keys()[0]]) != 0, (
+ 'Public Prometheus page is not reachable on {} from ctl '
+ 'nodes'.format(url)
+ )
@pytest.mark.sl_dup
@@ -128,9 +128,10 @@
tgt=ctl_nodes_pillar,
param='curl -s {}/ | grep Alertmanager'.format(url),
expr_form='pillar')
- assert len(result[result.keys()[0]]) != 0, \
- 'Internal AlertManager page is not reachable on {} ' \
- 'from ctl nodes'.format(url)
+ assert len(result[result.keys()[0]]) != 0, (
+ 'Internal AlertManager page is not reachable on {} from ctl '
+ 'nodes'.format(url)
+ )
@pytest.mark.smoke
@@ -145,9 +146,10 @@
tgt=ctl_nodes_pillar,
param='curl -k -s {}/ | grep Alertmanager'.format(url),
expr_form='pillar')
- assert len(result[result.keys()[0]]) != 0, \
- 'Public AlertManager page is not reachable on {} ' \
+ assert len(result[result.keys()[0]]) != 0, (
+ 'Public AlertManager page is not reachable on {} '
'from ctl nodes'.format(url)
+ )
@pytest.mark.sl_dup
@@ -163,9 +165,10 @@
tgt=ctl_nodes_pillar,
param='curl {}/login 2>&1 | grep Grafana'.format(url),
expr_form='pillar')
- assert len(result[result.keys()[0]]) != 0, \
- 'Internal Grafana page is not reachable on {} ' \
+ assert len(result[result.keys()[0]]) != 0, (
+ 'Internal Grafana page is not reachable on {} '
'from ctl nodes'.format(url)
+ )
@pytest.mark.smoke
@@ -180,8 +183,9 @@
tgt=ctl_nodes_pillar,
param='curl -k {}/login 2>&1 | grep Grafana'.format(url),
expr_form='pillar')
- assert len(result[result.keys()[0]]) != 0, \
+ assert len(result[result.keys()[0]]) != 0, (
'Public Grafana page is not reachable on {} from ctl nodes'.format(url)
+ )
@pytest.mark.sl_dup
@@ -195,11 +199,12 @@
url = "{}://{}:{}".format(protocol, IP, port)
result = local_salt_client.cmd(
tgt=ctl_nodes_pillar,
- param='curl {}/ 2>&1 | \
- grep Alerta'.format(url),
+ param='curl {}/ 2>&1 | grep Alerta'.format(url),
expr_form='pillar')
- assert len(result[result.keys()[0]]) != 0, \
- 'Internal Alerta page is not reachable on {} from ctl nodes'.format(url)
+ assert len(result[result.keys()[0]]) != 0, (
+ 'Internal Alerta page is not reachable on {} from '
+ 'ctl nodes'.format(url)
+ )
@pytest.mark.smoke
@@ -212,11 +217,10 @@
url = "{}://{}:{}".format(proto, IP, port)
result = local_salt_client.cmd(
tgt=ctl_nodes_pillar,
- param='curl -k {}/ 2>&1 | \
- grep Alerta'.format(url),
+ param='curl -k {}/ 2>&1 | grep Alerta'.format(url),
expr_form='pillar')
- assert len(result[result.keys()[0]]) != 0, \
- 'Public Alerta page is not reachable on {} from ctl nodes'.format(url)
+ assert len(result[result.keys()[0]]) != 0, (
+ 'Public Alerta page is not reachable on {} from ctl nodes'.format(url))
@pytest.mark.smoke
@@ -230,11 +234,11 @@
url = "{}://{}:{}".format(proto, IP, port)
result = local_salt_client.cmd(
tgt=ctl_nodes_pillar,
- param='curl -k {}/ 2>&1 | \
- grep Authentication'.format(url),
+ param='curl -k {}/ 2>&1 | grep Authentication'.format(url),
expr_form='pillar')
- assert len(result[result.keys()[0]]) != 0, \
+ assert len(result[result.keys()[0]]) != 0, (
'Public Jenkins page is not reachable on {} from ctl nodes'.format(url)
+ )
@pytest.mark.smoke
@@ -248,8 +252,7 @@
url = "{}://{}:{}".format(proto, IP, port)
result = local_salt_client.cmd(
tgt=ctl_nodes_pillar,
- param='curl -k {}/ 2>&1 | \
- grep "Gerrit Code Review"'.format(url),
+ param='curl -k {}/ 2>&1 | grep "Gerrit Code Review"'.format(url),
expr_form='pillar')
- assert len(result[result.keys()[0]]) != 0, \
- 'Public Gerrit page is not reachable on {} from ctl nodes'.format(url)
+ assert len(result[result.keys()[0]]) != 0, (
+ 'Public Gerrit page is not reachable on {} from ctl nodes'.format(url))