Merge pull request #638 from watson-developer-cloud/release

Release 2.8.0

Author: ehdsouza

test/unit/test_discovery_v1.py

@@ -1229,6 +1229,12 @@ def test_stopword_operations():
         responses.DELETE,
         url,
         status=200)
+    responses.add(
+        responses.GET,
+        url,
+        body='{"status": "ready", "type": "stopwords"}',
+        status=200,
+        content_type='application_json')
 
     discovery = watson_developer_cloud.DiscoveryV1('2017-11-07', username="username", password="password")
 
@@ -1237,10 +1243,13 @@ def test_stopword_operations():
         discovery.create_stopword_list('envid', 'colid', file)
         assert responses.calls[0].response.json() == {"status": "pending", "type": "stopwords"}
 
+    discovery.get_stopword_list_status('envid', 'colid')
+    assert responses.calls[1].response.json() == {"status": "ready", "type": "stopwords"}
+
     discovery.delete_stopword_list('envid', 'colid')
-    assert responses.calls[1].response.status_code == 200
+    assert responses.calls[2].response.status_code == 200
 
-    assert len(responses.calls) == 2
+    assert len(responses.calls) == 3
 
 @responses.activate
 def test_gateway_configuration():

test/unit/test_speech_to_text_v1.py

@@ -297,6 +297,29 @@ def test_acoustic_model():
 
     assert len(responses.calls) == 6
 
+@responses.activate
+def test_upgrade_acoustic_model():
+    acoustic_customization_url = 'https://stream.watsonplatform.net/speech-to-text/api/v1/acoustic_customizations'
+    upgrade_url = "{0}/{1}/upgrade_model".format(acoustic_customization_url, 'customid')
+
+    responses.add(
+        responses.POST,
+        upgrade_url,
+        body='{"bogus_response": "yep"}',
+        status=200,
+        content_type='application/json')
+
+    speech_to_text = watson_developer_cloud.SpeechToTextV1(
+        username="username", password="password")
+
+    speech_to_text.upgrade_acoustic_model(
+        'customid',
+        'model_x',
+        force=True)
+    assert responses.calls[0].response.json() == {"bogus_response": "yep"}
+
+    assert len(responses.calls) == 1
+
 
 def test_custom_corpora():
 

test/unit/test_watson_service.py

@@ -170,6 +170,17 @@ def test_for_icp():
     assert service2.password is not None
     assert service2.url is 'service_url'
 
+    service3 = AnyServiceV1('2017-07-07', iam_apikey='icp-xxx')
+    assert service3.token_manager is None
+    assert service2.iam_apikey is None
+    assert service2.username is not None
+    assert service2.password is not None
+
+    service4 = AnyServiceV1('2017-07-07', iam_access_token='lala')
+    assert service4.token_manager is not None
+    assert service4.username is None
+    assert service4.password is None
+
 @responses.activate
 def test_disable_SSL_verification():
     service1 = AnyServiceV1('2017-07-07', username='apikey', password='icp-xxxx', url='service_url')