Merge pull request #174 from plivo/fix-tests

Fix tests-cases

Author: huzaif-plivo

.github/workflows/unitTests.yml

@@ -0,0 +1,32 @@
+name: UnitTests
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+    
+jobs:
+  build:
+    name: UnitTests
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [2.7, 3.5, 3.6, 3.7]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Display Python version
+        run: python -c "import sys; print(sys.version)"
+      - name: Dependencies Installation
+        run: |
+          pip install tox
+      - name: Run Tests
+        run: |
+          python --version
+          tox -e py

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [4.18.1](https://github.com/plivo/plivo-python/tree/v4.18.1) (2021-07-16)
+- Updates to [add a member a multi-party call API](https://www.plivo.com/docs/voice/api/multiparty-call/participants#add-a-participant).
+  - Remove validation range for `delay` and `ringtimeout` parameters.
+  - Add appropriate error message for multiple `ringtimeout` and `delaydial` values.
+  - Fix the agent limit validation bug so that it only checks when multiple `to` param values are supplied.
+  - Fix the multiparty call and other voice API UT's.
+
 ## [4.18.0](https://github.com/plivo/plivo-python/tree/v4.18.0) (2021-07-13)
 - Power pack ID has been included to the response for the [list all messages API](https://www.plivo.com/docs/sms/api/message/list-all-messages/) and the [get message details API](https://www.plivo.com/docs/sms/api/message#retrieve-a-message).
 - Support for filtering messages by Power pack ID has been added to the [list all messages API](https://www.plivo.com/docs/sms/api/message#list-all-messages).

README.md

@@ -1,6 +1,6 @@
 # plivo-python
 
-[![Build Status](https://travis-ci.org/plivo/plivo-python.svg?branch=master)](https://travis-ci.org/plivo/plivo-python)
+[![UnitTests](https://github.com/plivo/plivo-python/actions/workflows/unitTests.yml/badge.svg?branch=master)](https://github.com/plivo/plivo-python/actions/workflows/unitTests.yml)
 [![PyPI](https://img.shields.io/pypi/v/plivo.svg)](https://pypi.python.org/pypi/plivo)
 [![PyPI](https://img.shields.io/pypi/pyversions/plivo.svg)](https://pypi.python.org/pypi/plivo)
 [![PyPI](https://img.shields.io/pypi/l/plivo.svg)](https://pypi.python.org/pypi/plivo)

plivo/resources/multipartycall.py

@@ -228,8 +228,8 @@ def get(self, uuid=None, friendly_name=None):
             of_type_exact(str),
             one_of(is_url(), is_in(('real', 'none'), case_sensitive=False, case_type='lower')),
         )],
-        ring_timeout=[optional(one_of(of_type_exact(str), of_type_exact(int)), multiple_valid_integers(15, 120))],
-        delay_dial=[optional(one_of(of_type_exact(str), of_type_exact(int)), multiple_valid_integers(0, 120))],
+        ring_timeout=[optional(one_of(of_type_exact(str), of_type_exact(int)), multiple_valid_integers())],
+        delay_dial=[optional(one_of(of_type_exact(str), of_type_exact(int)), multiple_valid_integers())],
         max_duration=[optional(
             of_type_exact(int),
             check(lambda max_duration: 300 <= max_duration <= 28800, '300 < max_duration <= 28800'))],
@@ -331,10 +331,14 @@ def add_participant(self,
             raise ValidationError('specify either call_uuid or (from, to)')
         if call_uuid is None and (not from_ or not to_):
             raise ValidationError('specify (from, to) when not adding an existing call_uuid to multi party participant')
-        if len(to_.split('<')) > 1 and role.lower() != "agent":
+        if to_ and len(to_.split('<')) > 1 and role.lower() != "agent":
             raise ValidationError('Multiple to_  values given for role ' + role)
-        elif len(to_.split('<')) > 20:
+        elif to_ and len(to_.split('<')) > 20:
             raise ValidationError('No of to_ values provided should be lesser than 20')
+        if to_ and len(str(ring_timeout).split('<')) > len(to_.split('<')):
+            raise ValidationError("RingTimeout:number of ring_timeout(s) should be same as number of destination(s)")
+        if to_ and len(str(delay_dial).split('<')) > len(to_.split('<')):
+            raise ValidationError("DelayDial:number of delay_dial(s) should be same as number of destination(s)")
         return self.client.request('POST', ('MultiPartyCall', mpc_id, 'Participant'),
                                    self.__clean_identifiers(to_param_dict(self.add_participant, locals())),
                                    is_voice_request=True)

plivo/utils/jwt.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import jwt, time
 from plivo.utils.validators import *
 

plivo/utils/validators.py

@@ -180,27 +180,17 @@ def f(name, value):
     return required(f)
 
 
-def multiple_valid_integers(lowerbound, upperbound):
+def multiple_valid_integers():
     def f(name, value):
-        if isinstance(value, int):
-            if value >= lowerbound and value <= upperbound:
-                return value, []
-            else:
-                return None, {name + ' value must be in range ' + str(lowerbound) + ' to ' + str(upperbound)}
-        else:
+        if isinstance(value, str):
             values = value.split('<')
             for i in values:
-                is_int = True
                 try:
                     int(i)
                 except ValueError:
-                    is_int = False
-                if is_int:
-                    if int(i) > upperbound or int(i) < lowerbound:
-                        return None, [name + ' destination value must be in range ' + str(lowerbound) + ' to ' + str(upperbound)]
-                else:
                     return None, ['{} destination value must be integer'.format(name)]
             return value, []
+        return value, []
     return f
 
 

plivo/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
-__version__ = '4.18.0'
+__version__ = '4.18.1'
 

setup.py

@@ -10,7 +10,7 @@
 
 setup(
     name='plivo',
-    version='4.18.0',
+    version='4.18.1',
     description='A Python SDK to make voice calls & send SMS using Plivo and to generate Plivo XML',
     long_description=long_description,
     url='https://github.com/plivo/plivo-python',
@@ -39,6 +39,7 @@
         'six >= 1, < 2',
         'decorator >= 4, < 5',
         'lxml >= 3, < 5',
+        'PyJWT==1.7.1'
     ],
     keywords=['plivo', 'plivo xml', 'voice calls', 'sms'],
     include_package_data=True,

tests/base.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 from unittest import TestCase
+from doctest import Example
+from lxml.doctestcompare import LXMLOutputChecker
 
 from httmock import HTTMock, all_requests
 
@@ -172,3 +174,12 @@ def get_url(self, *args, **kwargs):
                self.client.session.auth[0] + \
                '/' + '/'.join([quote_plus(arg)
                                for arg in args]) + '/?' + urlencode(kwargs)
+
+
+class PlivoXmlTestCase:
+
+    def assertXmlEqual(self, got, want):
+        checker = LXMLOutputChecker()
+        if not checker.check_output(want, got, 0):
+            message = checker.output_difference(Example("", want), got, 0)
+            raise AssertionError(message)

tests/decorators.py

@@ -20,7 +20,7 @@ def decorator(self, *args, **kwargs):
                     name + '.json'))
 
             try:
-                with io.open(path) as f:
+                with io.open(path, encoding='utf-8') as f:
                     self.expected_response = json.load(f)
                     self.client.set_expected_response(
                         status_code=status_code,