Updated tests to test agains hawkular-alerts latest docker image. (#52)

Author: rubenvp8510

.travis.yml

@@ -16,6 +16,6 @@ env:
     - PYTHONPATH=.
   matrix:
     - HAWKULAR_VERSION=latest
-    - HAWKULAR_VERSION=0.15
+    - HAWKULAR_IMAGE=hawkular/hawkular-alerts
 
 script: pytest

.travis/run_hawkular.sh

@@ -8,7 +8,11 @@ if [[ -z ${HAWKULAR_VERSION+x} ]]; then
     HAWKULAR_VERSION='latest'
 fi
 
-HAWKULAR_IMAGE=rubensvp/hawkular-metrics:${HAWKULAR_VERSION}
+if [[ -z ${HAWKULAR_IMAGE+x} ]]; then
+    HAWKULAR_IMAGE="rubensvp/hawkular-metrics"
+fi
+
+HAWKULAR_IMAGE=${HAWKULAR_IMAGE}:${HAWKULAR_VERSION}
 
 function metrics_status {
     curl -s http://localhost:8080/hawkular/metrics/status | jq -r '.MetricsService'  2> /dev/null
@@ -26,7 +30,7 @@ function wait_hawkular {
     METRICS_STATUS=$(metrics_status)
     ALERTS_STATUS=$(alerts_status)
     TOTAL_WAIT=0
-    echo "Starting hawkular metrics $HAWKULAR_VERSION ..."
+    echo "Starting hawkular-metrics:$HAWKULAR_VERSION ..."
     while ([ "$METRICS_STATUS" != "STARTED" ] || ( [ "$ALERTS_STATUS" != "STARTED" ] && [ "$HAWKULAR_VERSION" != "$LOWER_VERSION" ]) )  && [ ${TOTAL_WAIT} -lt ${MAX_STEPS} ]; do
         METRICS_STATUS=$(metrics_status)
         ALERTS_STATUS=$(alerts_status)
@@ -41,12 +45,30 @@ function wait_hawkular {
     done
 }
 
+function wait_hawkular_alerts {
+    ALERTS_STATUS=$(alerts_status)
+    TOTAL_WAIT=0
+    echo "Starting hawkular-alerts:$HAWKULAR_VERSION ..."
+    while [ "$ALERTS_STATUS" != "STARTED" ] && [ ${TOTAL_WAIT} -lt ${MAX_STEPS} ]; do
+        ALERTS_STATUS=$(alerts_status)
+        sleep ${WAIT_STEP}
+        echo "Hawkular alerts status: $ALERTS_STATUS"
+        TOTAL_WAIT=$((TOTAL_WAIT+WAIT_STEP))
+        echo "Waited $TOTAL_WAIT seconds for Hawkular alerts to start."
+    done
+}
+
+
 function launch_hawkular {
     docker run --name hawkular-metrics -p 8080:8080 --link hawkular-cassandra -d  ${HAWKULAR_IMAGE}
 }
 
+function launch_hawkular_alerts {
+    docker run --name hawkular-metrics -p 8080:8080 -d  ${HAWKULAR_IMAGE}
+}
+
 function launch_cassandra {
-    docker run --name  hawkular-cassandra  -e CASSANDRA_START_RPC=true -d cassandra:3.7
+    docker run --name  hawkular-cassandra  -e CASSANDRA_START_RPC=true -d cassandra:3.0.13
 }
 
 function wait_cassandra {
@@ -61,7 +83,12 @@ function wait_cassandra {
     done
 }
 
-launch_cassandra
-wait_cassandra
-launch_hawkular
-wait_hawkular
+if [[ "$HAWKULAR_IMAGE" == "hawkular/hawkular-alerts" ]]; then
+    launch_hawkular_alerts
+    wait_hawkular_alerts
+else
+    launch_cassandra
+    wait_cassandra
+    launch_hawkular
+    wait_hawkular
+fi

tests/base.py

@@ -1,10 +1,13 @@
 import os
 
 version = os.environ.get('HAWKULAR_VERSION','latest')
+docker_image = os.environ.get('HAWKULAR_IMAGE','latest')
 
 if version != 'latest':
     major_version, minor_version = version.split('.')
     major_version = int(major_version)
     minor_version = int(minor_version)
 else:
-    major_version = minor_version = 0
+    major_version = minor_version = 0
+
+is_alerts_image = (docker_image == 'hawkular/hawkular-alerts')

tests/test_metrics.py

@@ -22,6 +22,7 @@
 import os
 import base64
 from datetime import datetime, timedelta
+from tests import base
 
 try:
     import mock
@@ -39,7 +40,7 @@ def setUp(self):
         self.test_tenant = str(uuid.uuid4())
         self.client = HawkularMetricsClient(tenant_id=self.test_tenant, port=8080, authtoken='secret')
 
-
+@unittest.skipIf(base.is_alerts_image, "Metrics unavailable for this docker image")
 class TenantTestCase(TestMetricFunctionsBase):
     """
     Test creating and fetching tenants. Each creation test should also
@@ -84,6 +85,8 @@ def test_verify(self, m_query_status, m_urlopen):
         # Incorrect capitalization due to urllib2
         self.assertEqual('EEFFGGHH', req.get_header('Hawkular-admin-token'))
 
+
+@unittest.skipIf(base.is_alerts_image, "Metrics unavailable for this docker image")
 class MetricsTestCase(TestMetricFunctionsBase):
     """
     Test metric functionality, both adding definition and querying for definition,