Merge branch 'add-influxdb-tests' of https://github.com/bonicim/volttron

into bonicim-add-influxdb-tests
VOLTTRON · Sep 26, 2020 · 2d78e8d · 2d78e8d
2 parents bfafa71 + ff501d7
commit 2d78e8d
Show file tree

Hide file tree

Showing 4 changed files with 513 additions and 1 deletion.
diff --git a/ci-integration/virtualization/requirements_test.txt b/ci-integration/virtualization/requirements_test.txt
@@ -16,3 +16,4 @@ watchdog-gevent
 docker
 cryptography
 pymongo
+influxdb
diff --git a/pytest.ini b/pytest.ini
@@ -61,3 +61,4 @@ markers =
         mongoutils: level one integration tests for mongoutils
         sqlitefuncts: level one integration tests for sqlitefuncts
         unit: Run all unit/level one integration tests
+        influxdbutils: level one integration tests for influxdb
diff --git a/volttrontesting/fixtures/docker_wrapper.py b/volttrontesting/fixtures/docker_wrapper.py
@@ -46,7 +46,7 @@ def create_container(image_name: str, ports: dict = None, env: dict = None, comm
         """
 
         # Create docker client (Uses localhost as agent connection.
-        client = docker.from_env()
+        client = docker.from_env(version="auto")
 
         try:
             full_docker_image = image_name
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,3 +16,4 @@ watchdog-gevent @@
     docker
     cryptography
     pymongo
+    influxdb