Merge pull request #404 from watson-developer-cloud/integration-tests

Add pytest skipif if env file not found

Author: germanattanasio

test/integration/test_discovery_v1.py

@@ -3,8 +3,10 @@
 import os
 import watson_developer_cloud
 import random
+import pytest
 
-
+@pytest.mark.skipif(
+    os.getenv('VCAP_SERVICES') is None, reason='requires VCAP_SERVICES')
 class Discoveryv1(TestCase):
     def setUp(self):
         self.discovery = watson_developer_cloud.DiscoveryV1(

test/integration/test_speech_to_text_v1.py

@@ -2,8 +2,11 @@
 from unittest import TestCase
 import os
 import watson_developer_cloud
+import pytest
 
 
+@pytest.mark.skipif(
+    os.getenv('VCAP_SERVICES') is None, reason='requires VCAP_SERVICES')
 class TestSpeechToTextV1(TestCase):
     def setUp(self):
         self.speech_to_text = watson_developer_cloud.SpeechToTextV1(

test/integration/test_text_to_speech_v1.py

@@ -1,8 +1,11 @@
 # coding: utf-8
 import unittest
 import watson_developer_cloud
+import pytest
+import os
 
-
+@pytest.mark.skipif(
+    os.getenv('VCAP_SERVICES') is None, reason='requires VCAP_SERVICES')
 class TestIntegrationTextToSpeechV1(unittest.TestCase):
     def setUp(self):
         self.text_to_speech = watson_developer_cloud.TextToSpeechV1(

test/integration/test_visual_recognition.py

@@ -6,9 +6,9 @@
 from unittest import TestCase
 import json
 
-pytestmark = pytest.mark.skip('Run These Manually, they are destructive')
-
 
+@pytest.mark.skipif(
+    os.getenv('VCAP_SERVICES') is None, reason='requires VCAP_SERVICES')
 class IntegrationTestVisualRecognitionV3(TestCase):
     def setUp(self):
         self.visual_recognition = watson_developer_cloud.VisualRecognitionV3(
@@ -58,4 +58,3 @@ def test_custom_classifier(self):
         assert classifiers is not None
 
         output = self.visual_recognition.delete_classifier(classifier_id)
-        assert output is not None