added new test for broadcast HLS mutually exclusive options, cleaned up other tests

Author: maxkahan

tests/test_broadcast.py

@@ -8,6 +8,7 @@
 from six import u, PY2, PY3
 from expects import *
 from opentok import Client, Broadcast, __version__, BroadcastError
+from opentok.exceptions import BroadcastHLSOptionsError
 from .validate_jwt import validate_jwt_header
 
 
@@ -653,3 +654,38 @@ def test_set_broadcast_layout_throws_exception(self):
             broadcast_id,
             "horizontalPresentation",
         )
+
+    def test_broadcast_hls_mutually_exclusive_options_error(self):
+        """
+        Test invalid options in start_broadcast() method raises a BroadcastHLSOptionsError.
+        """
+        
+        options = {
+            "layout": {
+                "type": "custom",
+                "stylesheet": "the layout stylesheet (only used with type == custom)",
+            },
+            "maxDuration": 5400,
+            "outputs": {
+                "hls": {
+                    "lowLatency": True,
+                    "dvr": True
+                    },
+                "rtmp": [
+                    {
+                        "id": "foo",
+                        "serverUrl": "rtmp://myfooserver/myfooapp",
+                        "streamName": "myfoostream",
+                    },
+                    {
+                        "id": "bar",
+                        "serverUrl": "rtmp://mybarserver/mybarapp",
+                        "streamName": "mybarstream",
+                    },
+                ],
+            },
+            "resolution": "640x480",
+        }
+
+        with self.assertRaises(BroadcastHLSOptionsError):
+            self.opentok.start_broadcast(self.session_id, options)

tests/test_custom_jwt_claims.py

@@ -3,7 +3,7 @@
 from nose.tools import raises
 from expects import *
 
-from opentok import OpenTok, __version__
+from opentok import Client, __version__
 import time
 from jose import jwt
 
@@ -15,7 +15,7 @@ def setUp(self):
         self.session_id = u(
             "1_MX4xMjM0NTZ-flNhdCBNYXIgMTUgMTQ6NDI6MjMgUERUIDIwMTR-MC40OTAxMzAyNX4"
         )
-        self.opentok = OpenTok(self.api_key, self.api_secret)
+        self.opentok = Client(self.api_key, self.api_secret)
 
     def test_livetime_custom_claim(self):
         self.opentok.jwt_livetime = 5  # Token will expire 5 minutes in the future

tests/test_opentok.py

@@ -1,19 +1,11 @@
 import unittest
-from requests.models import Response
-
-from six import text_type, u, b, PY2, PY3
-from nose.tools import raises
 
 import requests
 import httpretty
-from sure import expect
 import random
 import string
 
-import json
-
-import opentok
-from opentok import Client, OpenTok
+from opentok import Client
 
 
 class OpenTokTest(unittest.TestCase):