Skip to content

Commit b3fc86f

Browse files
committed
tests create_time attribute of archive
1 parent e60dd3d commit b3fc86f

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

opentok/archives.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
from datetime import datetime, date
2-
from six import iteritems
2+
from six import iteritems, PY2, PY3
33
import json
4+
import pytz
5+
if PY3:
6+
from datetime import timezone
47

58
dthandler = lambda obj: obj.isoformat() if isinstance(obj, datetime) or isinstance(obj, date) else None
69

@@ -13,7 +16,10 @@ def __init__(self, sdk, values):
1316
self.status = values.get('status')
1417
self.session_id = values.get('sessionId')
1518
self.partner_id = values.get('partnerId')
16-
self.created_at = datetime.fromtimestamp(values.get('createdAt') / 1000)
19+
if PY2:
20+
self.created_at = datetime.fromtimestamp(values.get('createdAt') / 1000, pytz.UTC)
21+
if PY3:
22+
self.created_at = datetime.fromtimestamp(values.get('createdAt') // 1000, timezone.utc)
1723
self.size = values.get('size')
1824
self.duration = values.get('duration')
1925
self.url = values.get('url')

tests/test_archive_api.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import httpretty
66
import textwrap
77
import json
8+
import datetime
9+
import pytz
810

911
from opentok import OpenTok, Archive, __version__
1012

@@ -13,9 +15,6 @@ def setUp(self):
1315
self.api_key = u('123456')
1416
self.api_secret = u('1234567890abcdef1234567890abcdef1234567890')
1517
self.session_id = u('SESSIONID')
16-
# self.api_key = u('854511')
17-
# self.api_secret = u('***REMOVED***')
18-
# self.session_id = u('2_MX44NTQ1MTF-flR1ZSBOb3YgMTIgMDk6NDA6NTkgUFNUIDIwMTN-MC43NjU0Nzh-')
1918
self.opentok = OpenTok(self.api_key, self.api_secret)
2019

2120
@httpretty.activate
@@ -56,7 +55,11 @@ def test_start_archive(self):
5655
expect(archive).to.have.property(u('status')).being.equal(u('started'))
5756
expect(archive).to.have.property(u('session_id')).being.equal(u('SESSIONID'))
5857
expect(archive).to.have.property(u('partner_id')).being.equal(123456)
59-
#expect(archive).to.have.property(u('created_at')).being.equal(None)
58+
if PY2:
59+
created_at = datetime.datetime.fromtimestamp(1395183243, pytz.UTC)
60+
if PY3:
61+
created_at = datetime.datetime.fromtimestamp(1395183243, datetime.timezone.utc)
62+
expect(archive).to.have.property(u('created_at')).being.equal(created_at)
6063
expect(archive).to.have.property(u('size')).being.equal(0)
6164
expect(archive).to.have.property(u('duration')).being.equal(0)
6265
expect(archive).to.have.property(u('url')).being.equal(None)

0 commit comments

Comments
 (0)