Merge pull request #25 from CodersOfTheNight/dockerized-integration-testing

Dockerized integration testing

Author: zaibacu

.dockerignore

@@ -0,0 +1,2 @@
+*.pyc
+__pycache__/

.travis.yml

@@ -1,7 +1,11 @@
 language: python
 python:
 - 3.5
-- 3.6
+#- 3.6
+#- 3.7
+
+services:
+  - docker
 
 install:
   - python setup.py install

Makefile

@@ -0,0 +1,13 @@
+__PHONY__: all
+
+pull-containers:
+	docker-compose pull
+
+rebuild-compose:
+	docker-compose down && docker-compose build
+
+run-integration-tests: pull-containers rebuild-compose
+	docker-compose up --remove-orphans --abort-on-container-exit --exit-code-from oshino-query
+
+run-dev-environment: pull-containers rebuild-compose
+	docker-compose -f docker-compose.yml -f docker-compose.dev.yml up --remove-orphans

README.md

@@ -28,7 +28,7 @@ How to install
 
 Quickstart
 ==========
-It is highly recommended for new users to use [Quickstart Guide](quickstart.md)
+It is highly recommended for new users to use [Quickstart Guide](docs/quickstart.md)
 
 
 Riemann. What? Why? How?

compose/Dockerfile

@@ -0,0 +1,17 @@
+FROM python:3.7-alpine
+
+WORKDIR '/usr/src/oshino'
+
+COPY oshino ./oshino
+COPY requirements ./requirements
+COPY tests ./tests
+COPY README.md ./README.md
+COPY setup.py .
+
+COPY compose/config.yaml .
+
+
+RUN python setup.py install 
+RUN pip install -r ./requirements/test.txt
+
+CMD ["/usr/local/bin/oshino", "--config=config.yaml"]

compose/config.yaml

@@ -0,0 +1,11 @@
+---
+interval: 5
+loglevel: DEBUG
+riemann:
+  host: riemann
+  port: 5555
+agents:
+  - name: health-check
+    module: oshino.agents.http_agent.HttpAgent
+    url: https://www.python.org
+    tag: healthcheck

docker-compose.dev.yml

@@ -0,0 +1,15 @@
+version: "3"
+
+services:
+  oshino-query:
+    command: ["/bin/sh"]
+  riemann:
+    ports:
+      - "5555:5555"
+      - "5556:5556"
+  riemann-ui:
+    image: "rlister/riemann-dash"
+    depends_on:
+      - riemann
+    ports:
+      - "4567:4567"

docker-compose.yml

@@ -0,0 +1,19 @@
+version: "3"
+
+services:
+  oshino:
+    build:
+      context: .
+      dockerfile: compose/Dockerfile
+    depends_on:
+      - riemann
+  oshino-query:
+    build:
+      context: .
+      dockerfile: compose/Dockerfile
+    command: ["/usr/local/bin/pytest", "tests/it_query.py"]
+    depends_on:
+      - oshino
+      - riemann
+  riemann:
+    image: "rlister/riemann"

oshino/agents/__init__.py

@@ -1,6 +1,6 @@
 from abc import ABC, abstractmethod
 
-from oshino.util import current_ts
+from oshino.util import current_ts, timer
 
 
 class Agent(ABC):
@@ -37,15 +37,20 @@ async def process(self, event_fn):
     def is_valid(self):
         return "name" in self._data
 
-    async def pull_metrics(self, event_fn):
+    async def pull_metrics(self, event_fn, loop=None):
         """
         Method called by core.
         Should not be overwritten.
         """
         if self.lazy and not self.ready:
             return None
+        logger = self.get_logger()
 
+        ts = timer()
+        logger.trace("Waiting for process event")
         result = await self.process(event_fn)
+        td = int(timer() - ts)
+        logger.trace("It took: {}ms".format(td))
         self._last_run = current_ts()
         return result
 

oshino/agents/http_agent.py

@@ -1,6 +1,6 @@
 import aiohttp
 
-from time import time
+from ..util import timer
 from . import Agent
 
 
@@ -46,13 +46,13 @@ def translate_status(self, code):
 
     async def process(self, event_fn):
         logger = self.get_logger()
-        ts = time()
+        ts = timer()
         state = None
         async with aiohttp.ClientSession() as session:
             async with session.get(self.url) as resp:
                 state = self.translate_status(resp.status)
-        te = time()
-        span = int((te - ts) * 1000)
+        te = timer()
+        span = int(te - ts)
         logger.debug("Request to {url} returned status code {code}(as {state})"
                      "in {span} milliseconds.".format(url=self.url,
                                                       code=resp.status,