From 3ebc09670aa343c0964e50c2432b3662d4eabeb3 Mon Sep 17 00:00:00 2001
From: Peter Hamilton <peter.hamilton@jhuapl.edu>
Date: Thu, 20 Aug 2015 09:13:20 -0400
Subject: [PATCH] Updating integration tests to ignore software server

This change adds a new pytest marker, ignore. It is used to silently
skip the software server integration test suite, which is now broken
from a recent ssl update. A pytest ini configuration file is also added
to register the new marker.
---
 kmip/tests/integration/services/test_kmip_client.py | 3 +++
 pytest.ini                                          | 3 +++
 tox.ini                                             | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 pytest.ini

diff --git a/kmip/tests/integration/services/test_kmip_client.py b/kmip/tests/integration/services/test_kmip_client.py
index 5b41b7c..58dbdf7 100644
--- a/kmip/tests/integration/services/test_kmip_client.py
+++ b/kmip/tests/integration/services/test_kmip_client.py
@@ -13,6 +13,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+import pytest
+
 from testtools import TestCase
 
 from subprocess import Popen
@@ -55,6 +57,7 @@ from kmip.services.kmip_client import KMIPProxy
 import kmip.core.utils as utils
 
 
+@pytest.mark.ignore
 class TestKMIPClientIntegration(TestCase):
     STARTUP_TIME = 1.0
     SHUTDOWN_TIME = 0.1
diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 0000000..582459e
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,3 @@
+[pytest]
+markers =
+    ignore: skip the given test object
diff --git a/tox.ini b/tox.ini
index f82daaf..391c925 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,7 +18,7 @@ commands = flake8 kmip/
 deps = {[testenv]deps}
 basepython=python2.7
 commands =
-    py.test --strict kmip/tests/integration {posargs}
+    py.test --strict kmip/tests/integration -m "not ignore" {posargs}
 
 [flake8]
 exclude = .git,.tox,dist,rpmbuild,*.egg-info