Add integration tests for mysqlfuncts

VOLTTRON · Jun 26, 2020 · d7eb47c · d7eb47c
1 parent c92aed3
commit d7eb47c
Show file tree

Hide file tree

Showing 3 changed files with 614 additions and 7 deletions.
diff --git a/pytest.ini b/pytest.ini
@@ -51,3 +51,4 @@ markers =
         rmq_reconnect: rabbitmq reconnect tests
         rmq_shutdown: rabbitmq shutdown tests
         secure: Test platform and agents with secure platform options
+        mysqlfuncts: level one integration tests for mysqlfuncts
diff --git a/volttrontesting/fixtures/docker_wrapper.py b/volttrontesting/fixtures/docker_wrapper.py
@@ -65,11 +65,11 @@ def create_container(image_name: str, ports: dict = None, env: dict = None, comm
                 break
             time.sleep(0.1)
             container.reload()
-
-        if invalid:
-            yield None
-        else:
-            yield container
-
-        container.kill()
+        try:
+            if invalid:
+                yield None
+            else:
+                yield container
+        finally:
+            container.kill()